kernel: consolidated pull request
cover kernel: consolidated pull request
From: Bruce Ashfield <[email protected]>
Richard,
Here's a 4-pack of patches I've been testing. I don't expect any significant issues, in particular since 6.4 isn't yet the default kernel :)
The main part of this series is to fix menuconfig for 6.4+. A patch I created years ago to work around pkg-config use in the kernel needed to be tweaked. Which i've done.
I've also started the process of dropping that patch, as there's a variable we can use to point pkg-config to our -native variant. Once all supported kernels are new enough, I'll drop my kernel patch and the manipulation of the PKG_CONFIG* variables.
Bruce
The following changes since commit dcdfbd3b45c7442210a49f5db989fb188a329c2d:
libnss-nis: upgrade 3.1 -> 3.2 (2023-07-17 15:30:04 +0100)
are available in the Git repository at:
https://git.yoctoproject.org/poky-contrib zedd/kernel
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel
Bruce Ashfield (4):
linux-yocto/6.x: cfg: update ima.cfg to match current meta-integrity linux-yocto/6.4: update to v6.4.3
kernel: set HOSTPKG_CONFIG to use pkg-config-native linux-yocto/6.4: fix menuconfig
meta/classes-recipe/kernel.bbclass | 3 ++ .../linux/linux-yocto-rt_6.1.bb | 2 +- .../linux/linux-yocto-rt_6.4.bb | 6 ++-- .../linux/linux-yocto-tiny_6.1.bb | 2 +- .../linux/linux-yocto-tiny_6.4.bb | 6 ++-- meta/recipes-kernel/linux/linux-yocto_6.1.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_6.4.bb | 28 +++++++++---------- 7 files changed, 26 insertions(+), 23 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/4 linux-yocto/6.x: cfg: update ima.cfg to match current meta-integrity
From: Bruce Ashfield <[email protected]>
Integrating the following commit(s) to linux-yocto:
cba89f406c6 features: update ima.cfg to match current meta-integrity
--- meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_6.1.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_6.4.bb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb +1 -1
@@ -15,7 +15,7 @@ python () { } SRCREV_machine ?= "efb2c857761e865cd7947aab42eaa5ba77ef6ee7" -SRCREV_meta ?= "2eaed50911009f9ddbc74460093e17b22ef7daa0" +SRCREV_meta ?= "cba89f406c6e07a16018cb77b51950cbae8ec654" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https"
meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb +1 -1
@@ -15,7 +15,7 @@ python () { } SRCREV_machine ?= "0c7d2016a3a548fd8f7caf7b1f46abd71008cd5c" -SRCREV_meta ?= "fa08cd6bd6f9415c91da0dd72f4338bff3c68c68" +SRCREV_meta ?= "d40b8461761ed3a7a52c53a2b3129d5dbad04f41" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.4;destsuffix=${KMETA};protocol=https"
meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb +1 -1
@@ -18,7 +18,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "b110cf9bbc395fe757956839d8110e72368699f4" -SRCREV_meta ?= "2eaed50911009f9ddbc74460093e17b22ef7daa0" +SRCREV_meta ?= "cba89f406c6e07a16018cb77b51950cbae8ec654" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb +1 -1
@@ -18,7 +18,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "2bf4f46721ce8095f156566128a9feee2da09d20" -SRCREV_meta ?= "fa08cd6bd6f9415c91da0dd72f4338bff3c68c68" +SRCREV_meta ?= "d40b8461761ed3a7a52c53a2b3129d5dbad04f41" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_6.1.bb +1 -1
@@ -28,7 +28,7 @@ SRCREV_machine:qemux86 ?= "b110cf9bbc395fe757956839d8110e72368699f4" SRCREV_machine:qemux86-64 ?= "b110cf9bbc395fe757956839d8110e72368699f4" SRCREV_machine:qemumips64 ?= "6c6b1170464e1f64f78a45cf7e78d5c678f38f48" SRCREV_machine ?= "b110cf9bbc395fe757956839d8110e72368699f4" -SRCREV_meta ?= "2eaed50911009f9ddbc74460093e17b22ef7daa0" +SRCREV_meta ?= "cba89f406c6e07a16018cb77b51950cbae8ec654" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the <version>/base branch, which is pure upstream -stable, and the same
meta/recipes-kernel/linux/linux-yocto_6.4.bb +1 -1
@@ -28,7 +28,7 @@ SRCREV_machine:qemux86 ?= "2bf4f46721ce8095f156566128a9feee2da09d20" SRCREV_machine:qemux86-64 ?= "2bf4f46721ce8095f156566128a9feee2da09d20" SRCREV_machine:qemumips64 ?= "4dddf5763b3a26b7892ed75d02bcb9c25a3fe703" SRCREV_machine ?= "2bf4f46721ce8095f156566128a9feee2da09d20" -SRCREV_meta ?= "fa08cd6bd6f9415c91da0dd72f4338bff3c68c68" +SRCREV_meta ?= "d40b8461761ed3a7a52c53a2b3129d5dbad04f41" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the <version>/base branch, which is pure upstream -stable, and the same
Signature · 1 line
2.34.1
PATCH 2/4 linux-yocto/6.4: update to v6.4.3
In reply to [email protected]From: Bruce Ashfield <[email protected]>
Updating to the latest korg -stable release that comprises the following commits:
160f4124ea8b Linux 6.4.3
036666b4163d fork: lock VMAs of the parent process when forking 890ba5c464c2 bootmem: remove the vmemmap pages from kmemleak in free_bootmem_page e83e62fb1f38 mm: call arch_swap_restore() from do_swap_page() 18822d84fd09 mm: lock newly mapped VMA with corrected ordering 406815be903b mm: lock newly mapped VMA which can be modified after it becomes visible 10bef9542ad3 mm: lock a vma before stack expansion
--- .../linux/linux-yocto-rt_6.4.bb | 6 ++-- .../linux/linux-yocto-tiny_6.4.bb | 6 ++-- meta/recipes-kernel/linux/linux-yocto_6.4.bb | 28 +++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb +3 -3
@@ -14,13 +14,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "0c7d2016a3a548fd8f7caf7b1f46abd71008cd5c" -SRCREV_meta ?= "d40b8461761ed3a7a52c53a2b3129d5dbad04f41" +SRCREV_machine ?= "7682858d44d18f0aef63a29ae7a575fd06b839f1" +SRCREV_meta ?= "ba6cc4ef36e055aaa7710111d55ea30fa0549fc6" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.4;destsuffix=${KMETA};protocol=https" -LINUX_VERSION ?= "6.4.2" +LINUX_VERSION ?= "6.4.3" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb +3 -3
@@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc # CVE exclusions include recipes-kernel/linux/cve-exclusion_6.4.inc -LINUX_VERSION ?= "6.4.2" +LINUX_VERSION ?= "6.4.3" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}"
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "2bf4f46721ce8095f156566128a9feee2da09d20" -SRCREV_meta ?= "d40b8461761ed3a7a52c53a2b3129d5dbad04f41" +SRCREV_machine ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" +SRCREV_meta ?= "ba6cc4ef36e055aaa7710111d55ea30fa0549fc6" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_6.4.bb +14 -14
@@ -17,25 +17,25 @@ KBRANCH:qemux86-64 ?= "v6.4/standard/base" KBRANCH:qemuloongarch64 ?= "v6.4/standard/base" KBRANCH:qemumips64 ?= "v6.4/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "89ab6408aa244552f100996ac5a2b49379bf9a2b" -SRCREV_machine:qemuarm64 ?= "2bf4f46721ce8095f156566128a9feee2da09d20" -SRCREV_machine:qemuloongarch64 ?= "2bf4f46721ce8095f156566128a9feee2da09d20" -SRCREV_machine:qemumips ?= "7abe3962401b09a7768acc879070671308c04163" -SRCREV_machine:qemuppc ?= "2bf4f46721ce8095f156566128a9feee2da09d20" -SRCREV_machine:qemuriscv64 ?= "2bf4f46721ce8095f156566128a9feee2da09d20" -SRCREV_machine:qemuriscv32 ?= "2bf4f46721ce8095f156566128a9feee2da09d20" -SRCREV_machine:qemux86 ?= "2bf4f46721ce8095f156566128a9feee2da09d20" -SRCREV_machine:qemux86-64 ?= "2bf4f46721ce8095f156566128a9feee2da09d20" -SRCREV_machine:qemumips64 ?= "4dddf5763b3a26b7892ed75d02bcb9c25a3fe703" -SRCREV_machine ?= "2bf4f46721ce8095f156566128a9feee2da09d20" -SRCREV_meta ?= "d40b8461761ed3a7a52c53a2b3129d5dbad04f41" +SRCREV_machine:qemuarm ?= "16c806279fc162e769b1359be53941c210074bb6" +SRCREV_machine:qemuarm64 ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" +SRCREV_machine:qemuloongarch64 ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" +SRCREV_machine:qemumips ?= "1e22bf901a1b9e56293f93a8f06638608a64944b" +SRCREV_machine:qemuppc ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" +SRCREV_machine:qemuriscv64 ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" +SRCREV_machine:qemuriscv32 ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" +SRCREV_machine:qemux86 ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" +SRCREV_machine:qemux86-64 ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" +SRCREV_machine:qemumips64 ?= "0dfb1ac4cd963c856a8dc956cf79f561cf56e83f" +SRCREV_machine ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" +SRCREV_meta ?= "ba6cc4ef36e055aaa7710111d55ea30fa0549fc6" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the <version>/base branch, which is pure upstream -stable, and the same # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "d7defc5b8d422ba19ab762a96cf1b1eb158aa5a8" +SRCREV_machine:class-devupstream ?= "160f4124ea8b4cd6c86867e111fa55e266345a16" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v6.4/base"
@@ -43,7 +43,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.4;destsuffix=${KMETA};protocol=https" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "6.4.2" +LINUX_VERSION ?= "6.4.3" PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
2.34.1
PATCH 3/4 kernel: set HOSTPKG_CONFIG to use pkg-config-native
In reply to [email protected]From: Bruce Ashfield <[email protected]>
The 5.19 kernel introduced a variable to specify the pkg-config command to use for host tools.
Previously to this being introduced, we needed to overrride the standard PKG_CONFIG* variables to avoid calls to pkg-config using the target configuration.
While we can't completely drop the PKG_CONFIG workaround, we should introduce the new variable, and prepare to only use it once all supported kernels are 5.19+
--- meta/classes-recipe/kernel.bbclass | 3 +++ 1 file changed, 3 insertions(+)
meta/classes-recipe/kernel.bbclass +3 -0
@@ -355,6 +355,9 @@ kernel_do_compile() { export PKG_CONFIG_LIBDIR="$PKG_CONFIG_DIR" export PKG_CONFIG_SYSROOT_DIR="" + # for newer kernels (5.19+) there's a dedicated variable + export HOSTPKG_CONFIG="pkg-config-native" + if [ "${KERNEL_DEBUG_TIMESTAMPS}" != "1" ]; then # kernel sources do not use do_unpack, so SOURCE_DATE_EPOCH may not # be set....
Signature · 1 line
2.34.1
PATCH 4/4 linux-yocto/6.4: fix menuconfig
In reply to [email protected]From: Bruce Ashfield <[email protected]>
Integrating the following commit(s) to linux-yocto/6.4:
Author: Bruce Ashfield
Email: [email protected]
Subject: mconf: fix output of cflags and libraries
Date: Mon, 17 Jul 2023 17:17:55 -0400
commit 3122c84409d578a5df8bcb1 [kconfig: refactor Makefile to reduce process forks] changes the way that flags are detected. They are no longer just echo'd and captured, they are written to a file and later read.
We adjust our CROSS ncurses patch accordingly.
We'll eventually be able to drop this patch, but not quite yet.
--- .../linux/linux-yocto-rt_6.4.bb | 4 ++-- .../linux/linux-yocto-tiny_6.4.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_6.4.bb | 24 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb +2 -2
@@ -14,8 +14,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "7682858d44d18f0aef63a29ae7a575fd06b839f1" -SRCREV_meta ?= "ba6cc4ef36e055aaa7710111d55ea30fa0549fc6" +SRCREV_machine ?= "917d160a84f61aada28d09f5afc04d6451fa52a0" +SRCREV_meta ?= "dab56f52aa33b5cea1513b36b98e50a6c7c31f47" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.4;destsuffix=${KMETA};protocol=https"
meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb +2 -2
@@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" -SRCREV_meta ?= "ba6cc4ef36e055aaa7710111d55ea30fa0549fc6" +SRCREV_machine ?= "dee78ad1963cff9c063fba486d43fc9670285883" +SRCREV_meta ?= "dab56f52aa33b5cea1513b36b98e50a6c7c31f47" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_6.4.bb +12 -12
@@ -17,18 +17,18 @@ KBRANCH:qemux86-64 ?= "v6.4/standard/base" KBRANCH:qemuloongarch64 ?= "v6.4/standard/base" KBRANCH:qemumips64 ?= "v6.4/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "16c806279fc162e769b1359be53941c210074bb6" -SRCREV_machine:qemuarm64 ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" -SRCREV_machine:qemuloongarch64 ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" -SRCREV_machine:qemumips ?= "1e22bf901a1b9e56293f93a8f06638608a64944b" -SRCREV_machine:qemuppc ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" -SRCREV_machine:qemuriscv64 ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" -SRCREV_machine:qemuriscv32 ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" -SRCREV_machine:qemux86 ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" -SRCREV_machine:qemux86-64 ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" -SRCREV_machine:qemumips64 ?= "0dfb1ac4cd963c856a8dc956cf79f561cf56e83f" -SRCREV_machine ?= "17eff7ed940e09879e95c77bb66d5c3ffaed682e" -SRCREV_meta ?= "ba6cc4ef36e055aaa7710111d55ea30fa0549fc6" +SRCREV_machine:qemuarm ?= "aa7642358697dc9be32c4563a3d950f257a3f2ed" +SRCREV_machine:qemuarm64 ?= "dee78ad1963cff9c063fba486d43fc9670285883" +SRCREV_machine:qemuloongarch64 ?= "dee78ad1963cff9c063fba486d43fc9670285883" +SRCREV_machine:qemumips ?= "8a3ac37b45e7dcc98d28ab3920309340202272d9" +SRCREV_machine:qemuppc ?= "dee78ad1963cff9c063fba486d43fc9670285883" +SRCREV_machine:qemuriscv64 ?= "dee78ad1963cff9c063fba486d43fc9670285883" +SRCREV_machine:qemuriscv32 ?= "dee78ad1963cff9c063fba486d43fc9670285883" +SRCREV_machine:qemux86 ?= "dee78ad1963cff9c063fba486d43fc9670285883" +SRCREV_machine:qemux86-64 ?= "dee78ad1963cff9c063fba486d43fc9670285883" +SRCREV_machine:qemumips64 ?= "144ff37fee7f0499574d5b508e4db82234f38fec" +SRCREV_machine ?= "dee78ad1963cff9c063fba486d43fc9670285883" +SRCREV_meta ?= "dab56f52aa33b5cea1513b36b98e50a6c7c31f47" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the <version>/base branch, which is pure upstream -stable, and the same
Signature · 1 line
2.34.1