Message ID | 20220405012059.2680327-1-james.hilliard1@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | [1/1] linux/linux.mk: ensure custom kernel version is set | expand |
On 05/04/2022 03:20, James Hilliard wrote: > Validate that BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE is set when > required. > > Fixes: > http://autobuild.buildroot.net/results/117/117c08e414776202446a9fdb96d084aa3c16af48 > > Signed-off-by: James Hilliard <james.hilliard1@gmail.com> Applied to master, thanks. Regards, Arnout > --- > linux/linux.mk | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/linux/linux.mk b/linux/linux.mk > index 102b7a15d4..7ff7b05042 100644 > --- a/linux/linux.mk > +++ b/linux/linux.mk > @@ -566,6 +566,12 @@ endif > > ifeq ($(BR_BUILDING),y) > > +ifeq ($(BR2_LINUX_KERNEL_CUSTOM_VERSION),y) > +ifeq ($(LINUX_VERSION),) > +$(error No custom kernel version set. Check your BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE setting) > +endif > +endif > + > ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y) > # We must use the user-supplied kconfig value, because > # LINUX_KCONFIG_DEFCONFIG will at least contain the
>>>>> "James" == James Hilliard <james.hilliard1@gmail.com> writes: > Validate that BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE is set when > required. > Fixes: > http://autobuild.buildroot.net/results/117/117c08e414776202446a9fdb96d084aa3c16af48 > Signed-off-by: James Hilliard <james.hilliard1@gmail.com> Committed to 2022.02.x, thanks.
Hi Peter, On Sun, Apr 10 2022, Peter Korsgaard wrote: >>>>>> "James" == James Hilliard <james.hilliard1@gmail.com> writes: > > > Validate that BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE is set when > > required. > > > Fixes: > > http://autobuild.buildroot.net/results/117/117c08e414776202446a9fdb96d084aa3c16af48 > > > Signed-off-by: James Hilliard <james.hilliard1@gmail.com> > > Committed to 2022.02.x, thanks. Not in 2022.02.x as of commit 989c7c8f7b6e ("package/vim: security bump to version 8.2.4732"). baruch
>>>>> "Baruch" == Baruch Siach <baruch@tkos.co.il> writes: > Hi Peter, > On Sun, Apr 10 2022, Peter Korsgaard wrote: >>>>>>> "James" == James Hilliard <james.hilliard1@gmail.com> writes: >> >> > Validate that BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE is set when >> > required. >> >> > Fixes: >> > http://autobuild.buildroot.net/results/117/117c08e414776202446a9fdb96d084aa3c16af48 >> >> > Signed-off-by: James Hilliard <james.hilliard1@gmail.com> >> >> Committed to 2022.02.x, thanks. > Not in 2022.02.x as of commit 989c7c8f7b6e ("package/vim: security bump > to version 8.2.4732"). Ups, fixed now - Thanks!
diff --git a/linux/linux.mk b/linux/linux.mk index 102b7a15d4..7ff7b05042 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -566,6 +566,12 @@ endif ifeq ($(BR_BUILDING),y) +ifeq ($(BR2_LINUX_KERNEL_CUSTOM_VERSION),y) +ifeq ($(LINUX_VERSION),) +$(error No custom kernel version set. Check your BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE setting) +endif +endif + ifeq ($(BR2_LINUX_KERNEL_USE_DEFCONFIG),y) # We must use the user-supplied kconfig value, because # LINUX_KCONFIG_DEFCONFIG will at least contain the
Validate that BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE is set when required. Fixes: http://autobuild.buildroot.net/results/117/117c08e414776202446a9fdb96d084aa3c16af48 Signed-off-by: James Hilliard <james.hilliard1@gmail.com> --- linux/linux.mk | 6 ++++++ 1 file changed, 6 insertions(+)