[LEDE-DEV] [PATCH] build: Fix not altering KERNELRELEASE for external kernel

Daniel Golle daniel at makrotopia.org
Sun Jun 18 14:44:21 PDT 2017


Not completely related, but it came to my mind a couple of days ago
and maybe you can share your opinion:
Shouldn't we also be setting CONFIG_LOCALVERSION if *not* using an
external kernel, to indicate that this is *not* a vanilla kernel.org
codebase but actually got tons of OpenWrt/LEDE patches on top...?

See also
https://www.kernel.org/releases.html#distribution-kernels


On Sun, Jun 18, 2017 at 11:27:51PM +0200, Hauke Mehrtens wrote:
> When an external kernel tree is used the version should not get
> modified by the LEDE build scripts. This was added by Florian some time
> ago.
> The commit 0aed054becb21439 ("build: add KERNEL_MAKE and
> KERNEL_MAKE_FLAGS variables and move to kernel.mk") breaks this feature
> introduced in b6746a6ffb73 ("include: Do not alter KERNELRELEASE for
> external/git kernels").
> 
> Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
> ---
>  include/kernel.mk | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/include/kernel.mk b/include/kernel.mk
> index 464c94572e..7674f0dadc 100644
> --- a/include/kernel.mk
> +++ b/include/kernel.mk
> @@ -108,11 +108,10 @@ KERNEL_MAKE_FLAGS := \
>  	CONFIG_SHELL="$(BASH)" \
>  	$(if $(findstring c,$(OPENWRT_VERBOSE)),V=1,V='') \
>  	$(if $(PKG_BUILD_ID),LDFLAGS_MODULE=--build-id=0x$(PKG_BUILD_ID)) \
> -	KERNELRELEASE=$(LINUX_VERSION) \
>  	cmd_syscalls=
>  
>  ifeq ($(call qstrip,$(CONFIG_EXTERNAL_KERNEL_TREE))$(call qstrip,$(CONFIG_KERNEL_GIT_CLONE_URI)),)
> -  KERNEL_MAKEOPTS += \
> +  KERNEL_MAKE_FLAGS += \
>  	KERNELRELEASE=$(LINUX_VERSION)
>  endif
>  
> -- 
> 2.11.0
> 
> 
> _______________________________________________
> Lede-dev mailing list
> Lede-dev at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/lede-dev



More information about the Lede-dev mailing list