From 5706788603b38ad4a0987e187a1c11c06f4d4e6c Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 28 May 2020 21:29:17 -0400 Subject: [PATCH] linux-yocto/5.4: temporarily revert IKHEADERS in standard kernels We had a commit that enabled IKHEADERS, since bpf requires them on target. This is still causing incremental reproducibility errors during the module compilation phase of the build. We are temporarily turning this off, so we can integrate -stable and other related changes. A replacement feature "reproducibility" is also being added to this can be conditionally enabled while we debug. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index 760ded446af..e6366ee36d7 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "3d70f110c590b38219843a3a0815a232fd542cec" -SRCREV_meta ?= "2647d22ea8ac2d3af6fe3b0d635cf84ee06f95e3" +SRCREV_meta ?= "6d128007a79cdbecb66c5d8d186c0bbc41496526" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index 16459060347..4a37c758b20 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine_qemuarm ?= "80606f0432a35225e7bff188a890b836018bae61" SRCREV_machine ?= "1ef0d05b4662a4e5a075db47e7e368e9a12c4877" -SRCREV_meta ?= "2647d22ea8ac2d3af6fe3b0d635cf84ee06f95e3" +SRCREV_meta ?= "6d128007a79cdbecb66c5d8d186c0bbc41496526" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index 068cebca2c1..2bba72df772 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -21,7 +21,7 @@ SRCREV_machine_qemux86 ?= "1ef0d05b4662a4e5a075db47e7e368e9a12c4877" SRCREV_machine_qemux86-64 ?= "1ef0d05b4662a4e5a075db47e7e368e9a12c4877" SRCREV_machine_qemumips64 ?= "2da40cf3f065512eea3729172f8e3f0cf1857160" SRCREV_machine ?= "1ef0d05b4662a4e5a075db47e7e368e9a12c4877" -SRCREV_meta ?= "2647d22ea8ac2d3af6fe3b0d635cf84ee06f95e3" +SRCREV_meta ?= "6d128007a79cdbecb66c5d8d186c0bbc41496526" # remap qemuarm to qemuarma15 for the 5.4 kernel # KMACHINE_qemuarm ?= "qemuarma15" -- 2.47.3