summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2023-01-26 17:57:51 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-02-15 21:46:56 +0000
commite68aecd2a4e310f1af3db172289da1a9dac1b68f (patch)
treec84329189d73dde40b44faec81450721676b449e
parent50ee9f9c4e20c1c36bfbb66bbfd7588b003d9c4e (diff)
downloadpoky-e68aecd2a4e310f1af3db172289da1a9dac1b68f.tar.gz
kernel/linux-kernel-base: Fix kernel build artefact determinism issues
With the 6.1 kernel we've seen reproducibility/determinism issues where the kernel seems to rebuild headers referencing the hostname or local user. kernel-devsrc building after the kernel seemed to trigger it in some cases. Moving the definitions to the bbclass used by all the kernel recipe code including kernel-devsrc seems to be the best way to ensure this doesn't happen. (From OE-Core rev: 4c302827365903b99a517651c2a14661ce78f79b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 60681baa97daf4f3856453c34d6be08b6771a81b) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel.bbclass3
-rw-r--r--meta/classes/linux-kernel-base.bbclass4
2 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 54b006550d..df740af41d 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -204,9 +204,6 @@ PACKAGES_DYNAMIC += "^${KERNEL_PACKAGE_NAME}-firmware-.*"
204 204
205export OS = "${TARGET_OS}" 205export OS = "${TARGET_OS}"
206export CROSS_COMPILE = "${TARGET_PREFIX}" 206export CROSS_COMPILE = "${TARGET_PREFIX}"
207export KBUILD_BUILD_VERSION = "1"
208export KBUILD_BUILD_USER ?= "oe-user"
209export KBUILD_BUILD_HOST ?= "oe-host"
210 207
211KERNEL_RELEASE ?= "${KERNEL_VERSION}" 208KERNEL_RELEASE ?= "${KERNEL_VERSION}"
212 209
diff --git a/meta/classes/linux-kernel-base.bbclass b/meta/classes/linux-kernel-base.bbclass
index ba59222c24..73a6fe36d9 100644
--- a/meta/classes/linux-kernel-base.bbclass
+++ b/meta/classes/linux-kernel-base.bbclass
@@ -37,5 +37,9 @@ def linux_module_packages(s, d):
37 suffix = "" 37 suffix = ""
38 return " ".join(map(lambda s: "kernel-module-%s%s" % (s.lower().replace('_', '-').replace('@', '+'), suffix), s.split())) 38 return " ".join(map(lambda s: "kernel-module-%s%s" % (s.lower().replace('_', '-').replace('@', '+'), suffix), s.split()))
39 39
40export KBUILD_BUILD_VERSION = "1"
41export KBUILD_BUILD_USER ?= "oe-user"
42export KBUILD_BUILD_HOST ?= "oe-host"
43
40# that's all 44# that's all
41 45