From dfc0cc113eabb1160b6bfd630fa75c6a3cb9c7a5 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 8 Nov 2023 09:16:27 -0500 Subject: [PATCH] linux-yocto/6.1: cfg: restore CONFIG_DEVMEM Integrating the following commit(s) to linux-yocto/.: 1/1 [ Author: C. Andy Martin Email: cam@myfastmail.com Subject: security.cfg: restore strict-only /dev/mem access Date: Fri, 27 Oct 2023 11:22:06 -0400 CONFIG_DEVMEM was mistakenly not enabled, which defeats CONFIG_STRICT_DEVMEM and friends, as it completely removes all /dev/mem support. Signed-off-by: C. Andy Martin Signed-off-by: Bruce Ashfield ] Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb | 2 +- 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 6ebf533bb00..408fac718e4 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 ?= "0dad5306907b9e6fb89103dfba80dbd0edafcdb6" -SRCREV_meta ?= "0553e01ca003e82d32d9b85c0275568e8ce67274" +SRCREV_meta ?= "3ec1b83af3b59f07cf04e1264fbd30fe2f2f873b" 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 af98525c4f5..9bf6001353f 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 ?= "780d811bb97bf34f2be6cab28d5a8b099154c40d" -SRCREV_meta ?= "0553e01ca003e82d32d9b85c0275568e8ce67274" +SRCREV_meta ?= "3ec1b83af3b59f07cf04e1264fbd30fe2f2f873b" 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 9f17f244f80..f497ccedd97 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb @@ -29,7 +29,7 @@ SRCREV_machine:qemux86 ?= "780d811bb97bf34f2be6cab28d5a8b099154c40d" SRCREV_machine:qemux86-64 ?= "780d811bb97bf34f2be6cab28d5a8b099154c40d" SRCREV_machine:qemumips64 ?= "9f25eb5709ab8af0ece7306014d5e8b7c6150c68" SRCREV_machine ?= "780d811bb97bf34f2be6cab28d5a8b099154c40d" -SRCREV_meta ?= "0553e01ca003e82d32d9b85c0275568e8ce67274" +SRCREV_meta ?= "3ec1b83af3b59f07cf04e1264fbd30fe2f2f873b" # 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 -- 2.47.3