diff mbox series

[1/1] linux/linux.mk: ensure custom kernel version is set

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

Commit Message

James Hilliard April 5, 2022, 1:20 a.m. UTC
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(+)

Comments

Arnout Vandecappelle April 10, 2022, 2:50 p.m. UTC | #1
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
Peter Korsgaard April 10, 2022, 7:58 p.m. UTC | #2
>>>>> "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.
Baruch Siach April 11, 2022, 4:08 a.m. UTC | #3
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
Peter Korsgaard April 11, 2022, 6:30 a.m. UTC | #4
>>>>> "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 mbox series

Patch

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