diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2023-07-17 23:34:33 -0400 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2023-08-15 06:18:49 -1000 |
commit | 3bb6fd89f2e9d9c1cbfe3073348cb26903b6bc26 (patch) | |
tree | cc1513318ce8f86f1a0cd0bc4da456db3f0be1f5 | |
parent | 40e1576e5905343af5a076e985082eb4fec9c056 (diff) | |
download | poky-3bb6fd89f2e9d9c1cbfe3073348cb26903b6bc26.tar.gz |
linux-yocto/6.1: cfg: update ima.cfg to match current meta-integrity
Integrating the following commit(s) to linux-yocto:
cba89f406c6 features: update ima.cfg to match current meta-integrity
(From OE-Core rev: 855b9ed2110d7302fa81bad5d2275fa67b3402fd)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit 554690317dd8b882075e43213082b40fa3271cd5)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_6.1.bb | 2 |
3 files changed, 3 insertions, 3 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 30fcbd8e86..d4488b360c 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb | |||
@@ -15,7 +15,7 @@ python () { | |||
15 | } | 15 | } |
16 | 16 | ||
17 | SRCREV_machine ?= "efb2c857761e865cd7947aab42eaa5ba77ef6ee7" | 17 | SRCREV_machine ?= "efb2c857761e865cd7947aab42eaa5ba77ef6ee7" |
18 | SRCREV_meta ?= "2eaed50911009f9ddbc74460093e17b22ef7daa0" | 18 | SRCREV_meta ?= "cba89f406c6e07a16018cb77b51950cbae8ec654" |
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 be27537dbc..4e45e25975 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.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 ?= "b110cf9bbc395fe757956839d8110e72368699f4" | 20 | SRCREV_machine ?= "b110cf9bbc395fe757956839d8110e72368699f4" |
21 | SRCREV_meta ?= "2eaed50911009f9ddbc74460093e17b22ef7daa0" | 21 | SRCREV_meta ?= "cba89f406c6e07a16018cb77b51950cbae8ec654" |
22 | 22 | ||
23 | PV = "${LINUX_VERSION}+git${SRCPV}" | 23 | PV = "${LINUX_VERSION}+git${SRCPV}" |
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 5f61c43fed..be194ffdf9 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb | |||
@@ -28,7 +28,7 @@ SRCREV_machine:qemux86 ?= "b110cf9bbc395fe757956839d8110e72368699f4" | |||
28 | SRCREV_machine:qemux86-64 ?= "b110cf9bbc395fe757956839d8110e72368699f4" | 28 | SRCREV_machine:qemux86-64 ?= "b110cf9bbc395fe757956839d8110e72368699f4" |
29 | SRCREV_machine:qemumips64 ?= "6c6b1170464e1f64f78a45cf7e78d5c678f38f48" | 29 | SRCREV_machine:qemumips64 ?= "6c6b1170464e1f64f78a45cf7e78d5c678f38f48" |
30 | SRCREV_machine ?= "b110cf9bbc395fe757956839d8110e72368699f4" | 30 | SRCREV_machine ?= "b110cf9bbc395fe757956839d8110e72368699f4" |
31 | SRCREV_meta ?= "2eaed50911009f9ddbc74460093e17b22ef7daa0" | 31 | SRCREV_meta ?= "cba89f406c6e07a16018cb77b51950cbae8ec654" |
32 | 32 | ||
33 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll | 33 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll |
34 | # get the <version>/base branch, which is pure upstream -stable, and the same | 34 | # get the <version>/base branch, which is pure upstream -stable, and the same |