From: Bruce Ashfield Date: Thu, 21 Dec 2023 14:25:03 +0000 (-0500) Subject: linux-yocto/6.1: drop removed IMA option X-Git-Tag: uninative-4.4~633 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db11dfcd8304ded18fd21d7c4c2db50331402666;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git linux-yocto/6.1: drop removed IMA option Integrating the following commit(s) to linux-yocto/.: 1/1 [ Author: Paul Gortmaker Email: paul.gortmaker@windriver.com Subject: features/ima: drop now retired IMA_TRUSTED_KEYRING option Date: Wed, 6 Dec 2023 09:15:38 -0500 Unfortunately linux-stable backported this: Subject: ima: Remove deprecated IMA_TRUSTED_KEYRING Kconfig From: Nayna Jain [ Upstream commit 5087fd9e80e539d2163accd045b73da64de7de95 ] Time to remove "IMA_TRUSTED_KEYRING". ...to all releases still being maintained. stable-queue$git grep -l 5087fd9e80e539 releases/5.10.195/ima-remove-deprecated-ima_trusted_keyring-kconfig.patch releases/5.15.132/ima-remove-deprecated-ima_trusted_keyring-kconfig.patch releases/5.4.257/ima-remove-deprecated-ima_trusted_keyring-kconfig.patch releases/6.1.53/ima-remove-deprecated-ima_trusted_keyring-kconfig.patch releases/6.4.16/ima-remove-deprecated-ima_trusted_keyring-kconfig.patch releases/6.5.3/ima-remove-deprecated-ima_trusted_keyring-kconfig.patch So now when someone uses the feature, it triggers a do_kernel_configcheck warning when the audit runs. We added this file way back in 2019 so this fix will be needed on all active branches that are using an LTS linux-stable kernel listed above. Signed-off-by: Paul Gortmaker Signed-off-by: Bruce Ashfield ] Signed-off-by: Bruce Ashfield Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb index 3d9a98b5061..8d07058b713 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb @@ -14,8 +14,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "8987c29d0fc5680adf4f3ac89d6c8bd2bc279a53" -SRCREV_meta ?= "77f0a9eba731b83da9273d1c0d6bb1c3afd9b129" +SRCREV_machine ?= "2fc300ad2664d72a382351afaa02208e3bcec857" +SRCREV_meta ?= "5f331d55d0900030f5bc9b139c815f3f01a8ffd4" 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" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb index b966797d0b9..c0871532dfc 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb @@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "5d4da9e99880f594ca07d0a68d80d6b830728dc8" -SRCREV_meta ?= "77f0a9eba731b83da9273d1c0d6bb1c3afd9b129" +SRCREV_machine ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" +SRCREV_meta ?= "5f331d55d0900030f5bc9b139c815f3f01a8ffd4" PV = "${LINUX_VERSION}+git" diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb index cf65afa9228..6564731da94 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb @@ -18,18 +18,18 @@ KBRANCH:qemux86-64 ?= "v6.1/standard/base" KBRANCH:qemuloongarch64 ?= "v6.1/standard/base" KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "c7612f5ac940578eac19971dcfa4f52f25753074" -SRCREV_machine:qemuarm64 ?= "5d4da9e99880f594ca07d0a68d80d6b830728dc8" -SRCREV_machine:qemuloongarch64 ?= "5d4da9e99880f594ca07d0a68d80d6b830728dc8" -SRCREV_machine:qemumips ?= "61a56646314cdf030994524e9b04a89b79e0cb9b" -SRCREV_machine:qemuppc ?= "5d4da9e99880f594ca07d0a68d80d6b830728dc8" -SRCREV_machine:qemuriscv64 ?= "5d4da9e99880f594ca07d0a68d80d6b830728dc8" -SRCREV_machine:qemuriscv32 ?= "5d4da9e99880f594ca07d0a68d80d6b830728dc8" -SRCREV_machine:qemux86 ?= "5d4da9e99880f594ca07d0a68d80d6b830728dc8" -SRCREV_machine:qemux86-64 ?= "5d4da9e99880f594ca07d0a68d80d6b830728dc8" -SRCREV_machine:qemumips64 ?= "8d25ce2c226b61b29e600dc6b4018afa354a6e67" -SRCREV_machine ?= "5d4da9e99880f594ca07d0a68d80d6b830728dc8" -SRCREV_meta ?= "77f0a9eba731b83da9273d1c0d6bb1c3afd9b129" +SRCREV_machine:qemuarm ?= "b14dc32b21c8770b4e635ec69611aa32fff230b3" +SRCREV_machine:qemuarm64 ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" +SRCREV_machine:qemuloongarch64 ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" +SRCREV_machine:qemumips ?= "072df281d6a919a505df072b4741d49145cf3781" +SRCREV_machine:qemuppc ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" +SRCREV_machine:qemuriscv64 ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" +SRCREV_machine:qemuriscv32 ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" +SRCREV_machine:qemux86 ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" +SRCREV_machine:qemux86-64 ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" +SRCREV_machine:qemumips64 ?= "a5de8564807b47662da3670c5b358a1494faef77" +SRCREV_machine ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" +SRCREV_meta ?= "5f331d55d0900030f5bc9b139c815f3f01a8ffd4" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same