Skip to contentSkip to conversation

linux: simplify LINUX_BUILD_CMDS

PATCH New Thomas Petazzoni 4 participants 6 messages Apr 8, 2019 – Apr 24, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 linux: simplify LINUX_BUILD_CMDS

We currently do the Linux build as follows:

make <imagename>
if modules enabled; make modules; fi

However, Clement L?ger recently reported that due to us not using the "all" target, the GDB scripts that the kernel can build when CONFIG_GDB_SCRIPTS is enabled are not built, since upstream kernel commit 67274c083438340ad16c1437caebc84e1253b224 (merged in v5.1) moved that logic to a separate scripts_gdb target, which is a dependency of the "all" target.

While we could add some more logic to explicit generate the "scripts_gdb" target, this logic would fail on Linux < 5.1 for which this make target doesn't exist.

So instead, let's simplify the build logic, and use:

make all <imagename>

The "all" target automatically depends on "modules", so we no longer need to explicit generate the "modules" target separately.

As a result of this change, we may generate additional kernel images compared to what was done previously, but such images would anyway not be installed, and the additional built time is minimal.

We did some research as to why the kernel build was done like this in Buildroot, and it's been like that since linux/linux.mk was added back in 2010 by commit 487e21cff69b30b404146b2ffb46959a728a4002 ("New, simpler, infrastructure for building the Linux kernel").

---
 linux/linux.mk | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
linux/linux.mk +1 -4
index c7081db88f..46645f4780 100644
@@ -438,10 +438,7 @@ define LINUX_BUILD_CMDS
 	$(foreach dts,$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)), \
 		cp -f $(dts) $(LINUX_ARCH_PATH)/boot/dts/
 	)
-	$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME)
-	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \
-		$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ; \
-	fi
+	$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) all $(LINUX_TARGET_NAME)
 	$(LINUX_BUILD_DTB)
 	$(LINUX_APPEND_DTB)
 endef
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 linux: simplify LINUX_BUILD_CMDS

On 2019-04-08 22:21 +0200, Thomas Petazzoni spake thusly:

Quoted 12 lines

We currently do the Linux build as follows:

make <imagename>
if modules enabled; make modules; fi

However, Clement L?ger recently reported that due to us not using the "all" target, the GDB scripts that the kernel can build when CONFIG_GDB_SCRIPTS is enabled are not built, since upstream kernel commit 67274c083438340ad16c1437caebc84e1253b224 (merged in v5.1) moved that logic to a separate scripts_gdb target, which is a dependency of the "all" target.

Quoted 7 lines

While we could add some more logic to explicit generate the "scripts_gdb" target, this logic would fail on Linux < 5.1 for which this make target doesn't exist.

So instead, let's simplify the build logic, and use:

make all <imagename>

While we are at simplifying: do we still need to specify imagename?

Isn't the image name either:
- implicit for the architecture, or
- specified as a config option in the linux configuration?

Quoted 7 lines

The "all" target automatically depends on "modules", so we no longer need to explicit generate the "modules" target separately.

As a result of this change, we may generate additional kernel images compared to what was done previously, but such images would anyway not be installed, and the additional built time is minimal.

Quoted 7 lines

We did some research as to why the kernel build was done like this in Buildroot, and it's been like that since linux/linux.mk was added back in 2010 by commit 487e21cff69b30b404146b2ffb46959a728a4002 ("New, simpler, infrastructure for building the Linux kernel").

Regards,
Yann E. MORIN.

Quoted 27 lines
---
 linux/linux.mk | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
linux/linux.mk +1 -4
index c7081db88f..46645f4780 100644
@@ -438,10 +438,7 @@ define LINUX_BUILD_CMDS
 	$(foreach dts,$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)), \
 		cp -f $(dts) $(LINUX_ARCH_PATH)/boot/dts/
 	)
-	$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME)
-	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \
-		$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ; \
-	fi
+	$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) all $(LINUX_TARGET_NAME)
 	$(LINUX_BUILD_DTB)
 	$(LINUX_APPEND_DTB)
 endef
Signature · 6 lines
2.20.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#2 lore raw

PATCH 1/1 linux: simplify LINUX_BUILD_CMDS

Hello,

Quoted 3 lines · On Mon, 8 Apr 2019 22:48:32 +0200 "Yann E. MORIN" <[email protected]>…

Isn't the image name either:
- implicit for the architecture, or
- specified as a config option in the linux configuration?

Nope. At least on ARM, what gets built by default is a zImage, but some people might want a uImage, and that isn't specified by the kernel configuration.

Ditto for many other architectures: the kernel image type is rarely defined by the kernel configuration.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH 1/1 linux: simplify LINUX_BUILD_CMDS

In reply to Yann E. MORIN
Quoted 21 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

On 2019-04-08 22:21 +0200, Thomas Petazzoni spake thusly:

Quoted 18 lines

We currently do the Linux build as follows:

make <imagename>
if modules enabled; make modules; fi

However, Clement L?ger recently reported that due to us not using the "all" target, the GDB scripts that the kernel can build when CONFIG_GDB_SCRIPTS is enabled are not built, since upstream kernel commit 67274c083438340ad16c1437caebc84e1253b224 (merged in v5.1) moved that logic to a separate scripts_gdb target, which is a dependency of the "all" target.

While we could add some more logic to explicit generate the "scripts_gdb" target, this logic would fail on Linux < 5.1 for which this make target doesn't exist.

So instead, let's simplify the build logic, and use:

Quoted 7 lines
Quoted 1 line

make all <imagename>

While we are at simplifying: do we still need to specify imagename?

Isn't the image name either:
- implicit for the architecture, or
- specified as a config option in the linux configuration?

I'm not sure that is always the case, E.G. the uImage target is afaik not built by "make all".

The patch itself looks good:

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH 1/1 linux: simplify LINUX_BUILD_CMDS

In reply to Thomas Petazzoni
Quoted 27 lines · Thomas Petazzoni

We currently do the Linux build as follows:

make <imagename>
if modules enabled; make modules; fi

However, Clement L?ger recently reported that due to us not using the "all" target, the GDB scripts that the kernel can build when CONFIG_GDB_SCRIPTS is enabled are not built, since upstream kernel commit 67274c083438340ad16c1437caebc84e1253b224 (merged in v5.1) moved that logic to a separate scripts_gdb target, which is a dependency of the "all" target.

While we could add some more logic to explicit generate the "scripts_gdb" target, this logic would fail on Linux < 5.1 for which this make target doesn't exist.

So instead, let's simplify the build logic, and use:

make all <imagename>

The "all" target automatically depends on "modules", so we no longer need to explicit generate the "modules" target separately.

As a result of this change, we may generate additional kernel images compared to what was done previously, but such images would anyway not be installed, and the additional built time is minimal.

Quoted 7 lines

We did some research as to why the kernel build was done like this in Buildroot, and it's been like that since linux/linux.mk was added back in 2010 by commit 487e21cff69b30b404146b2ffb46959a728a4002 ("New, simpler, infrastructure for building the Linux kernel").

Applied to master, thanks.

Regards,
Arnout

Quoted 21 lines
---
 linux/linux.mk | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
linux/linux.mk +1 -4
index c7081db88f..46645f4780 100644
@@ -438,10 +438,7 @@ define LINUX_BUILD_CMDS
 	$(foreach dts,$(call qstrip,$(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH)), \
 		cp -f $(dts) $(LINUX_ARCH_PATH)/boot/dts/
 	)
-	$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME)
-	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then \
-		$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ; \
-	fi
+	$(LINUX_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) all $(LINUX_TARGET_NAME)
 	$(LINUX_BUILD_DTB)
 	$(LINUX_APPEND_DTB)
 endef
#5 lore raw

PATCH 1/1 linux: simplify LINUX_BUILD_CMDS

In reply to Thomas Petazzoni
Quoted 28 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

We currently do the Linux build as follows:
make <imagename>
if modules enabled; make modules; fi

However, Clement L?ger recently reported that due to us not using the "all" target, the GDB scripts that the kernel can build when CONFIG_GDB_SCRIPTS is enabled are not built, since upstream kernel commit 67274c083438340ad16c1437caebc84e1253b224 (merged in v5.1) moved that logic to a separate scripts_gdb target, which is a dependency of the "all" target.

While we could add some more logic to explicit generate the "scripts_gdb" target, this logic would fail on Linux < 5.1 for which this make target doesn't exist.

So instead, let's simplify the build logic, and use:

make all <imagename>

The "all" target automatically depends on "modules", so we no longer need to explicit generate the "modules" target separately.

As a result of this change, we may generate additional kernel images compared to what was done previously, but such images would anyway not be installed, and the additional built time is minimal.

Quoted 7 lines

We did some research as to why the kernel build was done like this in Buildroot, and it's been like that since linux/linux.mk was added back in 2010 by commit 487e21cff69b30b404146b2ffb46959a728a4002 ("New, simpler, infrastructure for building the Linux kernel").

Committed to 2019.02.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard