From c2009e9f757fe759c74406f1025967b7b8e77f0a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 5 Feb 2020 15:48:39 +0100 Subject: [PATCH] package/linux-headers: license files hashes only valid for latest version Like we did for the linux kernel, change linux-headers to only check the license hashes for the latest known version as the content of COPYING has changed between versions. To simplify the test, we introduce an intermediate, blind option that get selected when the latest kernel sources are used. Reported-by: Peter Korsgaard Signed-off-by: Yann E. MORIN Cc: Markus Mayer Signed-off-by: Peter Korsgaard --- 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 9f46a1052b3..094fb9e10e8 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 version (for license 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 676c8c44ea1..2b7879c62f5 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