[Buildroot] [PATCH] linux: simplify LINUX_BUILD_CMDS

Arnout Vandecappelle arnout at mind.be
Sat Apr 13 15:18:14 UTC 2019



On 08/04/2019 22:21, Thomas Petazzoni wrote:
> 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").
> 
> Reported-by: Clément Leger <cleger at kalray.eu>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>

 Applied to master, thanks.

 Regards,
 Arnout

> ---
>  linux/linux.mk | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/linux/linux.mk b/linux/linux.mk
> index c7081db88f..46645f4780 100644
> --- a/linux/linux.mk
> +++ b/linux/linux.mk
> @@ -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
> 


More information about the buildroot mailing list