diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2023-12-21 09:25:04 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-12-23 08:46:00 +0000 |
commit | b574de9c4d770d3f48f5d8042120d4556a4fc72a (patch) | |
tree | 4ef0f24b1f44e2e5171e3c41979ab6fe005a5758 /meta/recipes-kernel/linux | |
parent | df9829d710ddbe4b342aee428c36c32820c11b7b (diff) | |
download | poky-b574de9c4d770d3f48f5d8042120d4556a4fc72a.tar.gz |
linux-yocto/6.5: 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: d575b2822c1779077177deb177bafa94ab975bfc)
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/linux')
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_6.5.bb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb index 62020312f8..fccf0252d0 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb | |||
@@ -15,7 +15,7 @@ python () { | |||
15 | } | 15 | } |
16 | 16 | ||
17 | SRCREV_machine ?= "1d89cd73350cad73ecf330ad3785e6d8bdec092d" | 17 | SRCREV_machine ?= "1d89cd73350cad73ecf330ad3785e6d8bdec092d" |
18 | SRCREV_meta ?= "867a6bdef9701f378f5a9ce66a713daa22598649" | 18 | SRCREV_meta ?= "3b1f87ec237ec3ad9acffb3d75c55efe958085dc" |
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.5;destsuffix=${KMETA};protocol=https" | 21 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.5;destsuffix=${KMETA};protocol=https" |
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb index f57bc47b37..b63d5ad893 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb | |||
@@ -18,7 +18,7 @@ KMETA = "kernel-meta" | |||
18 | KCONF_BSP_AUDIT_LEVEL = "2" | 18 | KCONF_BSP_AUDIT_LEVEL = "2" |
19 | 19 | ||
20 | SRCREV_machine ?= "95753fe2a7d507646224fe973e2a4fc48cb7694d" | 20 | SRCREV_machine ?= "95753fe2a7d507646224fe973e2a4fc48cb7694d" |
21 | SRCREV_meta ?= "867a6bdef9701f378f5a9ce66a713daa22598649" | 21 | SRCREV_meta ?= "3b1f87ec237ec3ad9acffb3d75c55efe958085dc" |
22 | 22 | ||
23 | PV = "${LINUX_VERSION}+git" | 23 | PV = "${LINUX_VERSION}+git" |
24 | 24 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.5.bb b/meta/recipes-kernel/linux/linux-yocto_6.5.bb index 1233140f8e..984940d24c 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.5.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.5.bb | |||
@@ -29,7 +29,7 @@ SRCREV_machine:qemux86 ?= "7fe59b2e3f40a94ce4477854264e219aeb972990" | |||
29 | SRCREV_machine:qemux86-64 ?= "7fe59b2e3f40a94ce4477854264e219aeb972990" | 29 | SRCREV_machine:qemux86-64 ?= "7fe59b2e3f40a94ce4477854264e219aeb972990" |
30 | SRCREV_machine:qemumips64 ?= "ff5efc72e961cf345f935ac14cdcaa9843ec5b23" | 30 | SRCREV_machine:qemumips64 ?= "ff5efc72e961cf345f935ac14cdcaa9843ec5b23" |
31 | SRCREV_machine ?= "7fe59b2e3f40a94ce4477854264e219aeb972990" | 31 | SRCREV_machine ?= "7fe59b2e3f40a94ce4477854264e219aeb972990" |
32 | SRCREV_meta ?= "867a6bdef9701f378f5a9ce66a713daa22598649" | 32 | SRCREV_meta ?= "3b1f87ec237ec3ad9acffb3d75c55efe958085dc" |
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 |