From 3f6007613beb7f4dda7f9548e6f0e7c9f3dd4ffb Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 17 Jul 2023 23:34:33 -0400 Subject: linux-yocto/6.x: 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: 554690317dd8b882075e43213082b40fa3271cd5) Signed-off-by: Armin Kuster Signed-off-by: Bruce Ashfield Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- 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(-) 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 () { } 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" diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb index acd41b1b4b..4a048b19f4 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb @@ -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" 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" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "b110cf9bbc395fe757956839d8110e72368699f4" -SRCREV_meta ?= "2eaed50911009f9ddbc74460093e17b22ef7daa0" +SRCREV_meta ?= "cba89f406c6e07a16018cb77b51950cbae8ec654" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb index 88a29bf0cb..67bea2223f 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb @@ -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}" diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb index b6a275c363..a76d2dc404 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" 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 /base branch, which is pure upstream -stable, and the same diff --git a/meta/recipes-kernel/linux/linux-yocto_6.4.bb b/meta/recipes-kernel/linux/linux-yocto_6.4.bb index 95ef005a14..0252543c35 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.4.bb @@ -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 /base branch, which is pure upstream -stable, and the same -- cgit v1.2.3-54-g00ecf