diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2023-12-21 09:25:03 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-12-23 08:46:00 +0000 |
commit | df9829d710ddbe4b342aee428c36c32820c11b7b (patch) | |
tree | 6aa0df85931f982810f466dd5a5fa76a88501352 /meta/recipes-kernel | |
parent | 7608ad08ae677b16d4684243a05e4e6bf6b8632a (diff) | |
download | poky-df9829d710ddbe4b342aee428c36c32820c11b7b.tar.gz |
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 <nayna@linux.ibm.com>
[ 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 <paul.gortmaker@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
]
(From OE-Core rev: db11dfcd8304ded18fd21d7c4c2db50331402666)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_6.1.bb | 24 |
3 files changed, 16 insertions, 16 deletions
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 3d9a98b506..8d07058b71 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 () { | |||
14 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 14 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
15 | } | 15 | } |
16 | 16 | ||
17 | SRCREV_machine ?= "8987c29d0fc5680adf4f3ac89d6c8bd2bc279a53" | 17 | SRCREV_machine ?= "2fc300ad2664d72a382351afaa02208e3bcec857" |
18 | SRCREV_meta ?= "77f0a9eba731b83da9273d1c0d6bb1c3afd9b129" | 18 | SRCREV_meta ?= "5f331d55d0900030f5bc9b139c815f3f01a8ffd4" |
19 | 19 | ||
20 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ | 20 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ |
21 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" | 21 | 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 b966797d0b..c0871532df 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" | |||
17 | KMETA = "kernel-meta" | 17 | KMETA = "kernel-meta" |
18 | KCONF_BSP_AUDIT_LEVEL = "2" | 18 | KCONF_BSP_AUDIT_LEVEL = "2" |
19 | 19 | ||
20 | SRCREV_machine ?= "5d4da9e99880f594ca07d0a68d80d6b830728dc8" | 20 | SRCREV_machine ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" |
21 | SRCREV_meta ?= "77f0a9eba731b83da9273d1c0d6bb1c3afd9b129" | 21 | SRCREV_meta ?= "5f331d55d0900030f5bc9b139c815f3f01a8ffd4" |
22 | 22 | ||
23 | PV = "${LINUX_VERSION}+git" | 23 | PV = "${LINUX_VERSION}+git" |
24 | 24 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb index cf65afa922..6564731da9 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" | |||
18 | KBRANCH:qemuloongarch64 ?= "v6.1/standard/base" | 18 | KBRANCH:qemuloongarch64 ?= "v6.1/standard/base" |
19 | KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64" | 19 | KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64" |
20 | 20 | ||
21 | SRCREV_machine:qemuarm ?= "c7612f5ac940578eac19971dcfa4f52f25753074" | 21 | SRCREV_machine:qemuarm ?= "b14dc32b21c8770b4e635ec69611aa32fff230b3" |
22 | SRCREV_machine:qemuarm64 ?= "5d4da9e99880f594ca07d0a68d80d6b830728dc8" | 22 | SRCREV_machine:qemuarm64 ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" |
23 | SRCREV_machine:qemuloongarch64 ?= "5d4da9e99880f594ca07d0a68d80d6b830728dc8" | 23 | SRCREV_machine:qemuloongarch64 ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" |
24 | SRCREV_machine:qemumips ?= "61a56646314cdf030994524e9b04a89b79e0cb9b" | 24 | SRCREV_machine:qemumips ?= "072df281d6a919a505df072b4741d49145cf3781" |
25 | SRCREV_machine:qemuppc ?= "5d4da9e99880f594ca07d0a68d80d6b830728dc8" | 25 | SRCREV_machine:qemuppc ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" |
26 | SRCREV_machine:qemuriscv64 ?= "5d4da9e99880f594ca07d0a68d80d6b830728dc8" | 26 | SRCREV_machine:qemuriscv64 ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" |
27 | SRCREV_machine:qemuriscv32 ?= "5d4da9e99880f594ca07d0a68d80d6b830728dc8" | 27 | SRCREV_machine:qemuriscv32 ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" |
28 | SRCREV_machine:qemux86 ?= "5d4da9e99880f594ca07d0a68d80d6b830728dc8" | 28 | SRCREV_machine:qemux86 ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" |
29 | SRCREV_machine:qemux86-64 ?= "5d4da9e99880f594ca07d0a68d80d6b830728dc8" | 29 | SRCREV_machine:qemux86-64 ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" |
30 | SRCREV_machine:qemumips64 ?= "8d25ce2c226b61b29e600dc6b4018afa354a6e67" | 30 | SRCREV_machine:qemumips64 ?= "a5de8564807b47662da3670c5b358a1494faef77" |
31 | SRCREV_machine ?= "5d4da9e99880f594ca07d0a68d80d6b830728dc8" | 31 | SRCREV_machine ?= "e083231c43f3773e5ca1f6d46411e1fda1081a6e" |
32 | SRCREV_meta ?= "77f0a9eba731b83da9273d1c0d6bb1c3afd9b129" | 32 | SRCREV_meta ?= "5f331d55d0900030f5bc9b139c815f3f01a8ffd4" |
33 | 33 | ||
34 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll | 34 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll |
35 | # get the <version>/base branch, which is pure upstream -stable, and the same | 35 | # get the <version>/base branch, which is pure upstream -stable, and the same |