[Buildroot] [PATCH 2/6 v2] package/linux-headers: license files hashes only valid for latest version

Yann E. MORIN yann.morin.1998 at free.fr
Wed Feb 5 14:48:39 UTC 2020


Like we did on the previous commit, change linux-headers to only check
the license hashes for the latest known version.

To simplify the test, we introduce an intermediate, blind option that get
selected by the two latest versions.

Reported-by: Peter Korsgaard <peter at korsgaard.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998 at free.fr>
Cc: Markus Mayer <mmayer at broadcom.com>
---
 package/linux-headers/Config.in.host   | 6 ++++++
 package/linux-headers/linux-headers.mk | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host
index 9f46a1052b..7a68ab7492 100644
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@@ -25,6 +25,7 @@ choice
 config BR2_KERNEL_HEADERS_AS_KERNEL
 	bool "Same as kernel being built"
 	depends on BR2_LINUX_KERNEL
+	select BR2_KERNEL_HEADERS_LATEST if BR2_LINUX_KERNEL_LATEST_VERSION
 
 config BR2_KERNEL_HEADERS_4_4
 	bool "Linux 4.4.x kernel headers"
@@ -52,6 +53,7 @@ config BR2_KERNEL_HEADERS_4_19
 config BR2_KERNEL_HEADERS_5_4
 	bool "Linux 5.4.x kernel headers"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_4
+	select BR2_KERNEL_HEADERS_LATEST
 
 config BR2_KERNEL_HEADERS_VERSION
 	bool "Manually specified Linux version"
@@ -83,6 +85,10 @@ config BR2_KERNEL_HEADERS_CUSTOM_GIT
 
 endchoice
 
+# Select this for the latest kernel headers ersion (for licenses hashes)
+config BR2_KERNEL_HEADERS_LATEST
+	bool
+
 config BR2_DEFAULT_KERNEL_VERSION
 	string "linux version"
 	depends on BR2_KERNEL_HEADERS_VERSION
diff --git a/package/linux-headers/linux-headers.mk b/package/linux-headers/linux-headers.mk
index 676c8c44ea..2b7879c62f 100644
--- a/package/linux-headers/linux-headers.mk
+++ b/package/linux-headers/linux-headers.mk
@@ -91,7 +91,12 @@ endif
 LINUX_HEADERS_DL_SUBDIR = linux
 
 LINUX_HEADERS_LICENSE = GPL-2.0
-LINUX_HEADERS_LICENSE_FILES = COPYING
+ifeq ($(BR2_KERNEL_HEADERS_LATEST),y)
+LINUX_HEADERS_LICENSE_FILES = \
+	COPYING \
+	LICENSES/preferred/GPL-2.0 \
+	LICENSES/exceptions/Linux-syscall-note
+endif
 
 LINUX_HEADERS_INSTALL_STAGING = YES
 
-- 
2.20.1



More information about the buildroot mailing list