From 6d7d4ccc054083f819d9243f278e8c670b6054f3 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 2 Nov 2023 17:55:36 -0400 Subject: linux-yocto/6.5: 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 ] (From OE-Core rev: 98d448d05a3f4166569159756f8bfaac4ce358ab) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit c459be32000d703aad179a4bf5ef2479813f0404) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_6.5.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta') 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 b34351529d..552df49949 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 () { } SRCREV_machine ?= "a19b0be3292c96a0cc9c0ebb8f9d104d6a4d3e10" -SRCREV_meta ?= "6e1f2cc45e8c78278fea51b7cfd0bf1180e5605a" +SRCREV_meta ?= "fa8ffc924f6d91ea09c9f792a5bb8a184ec1657a" 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.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 abf548b2c8..194c5c10f2 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" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "4e79d57b9c5cc230d2d8cb40c393515fedfed134" -SRCREV_meta ?= "6e1f2cc45e8c78278fea51b7cfd0bf1180e5605a" +SRCREV_meta ?= "fa8ffc924f6d91ea09c9f792a5bb8a184ec1657a" PV = "${LINUX_VERSION}+git" diff --git a/meta/recipes-kernel/linux/linux-yocto_6.5.bb b/meta/recipes-kernel/linux/linux-yocto_6.5.bb index 120a3afe25..bec4b7c049 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 ?= "11bbc8db249543905b6fe9b660575202fa0e3ed0" SRCREV_machine:qemux86-64 ?= "11bbc8db249543905b6fe9b660575202fa0e3ed0" SRCREV_machine:qemumips64 ?= "3b119ebc63b9889194b0125bfae96ee5830e538c" SRCREV_machine ?= "11bbc8db249543905b6fe9b660575202fa0e3ed0" -SRCREV_meta ?= "6e1f2cc45e8c78278fea51b7cfd0bf1180e5605a" +SRCREV_meta ?= "fa8ffc924f6d91ea09c9f792a5bb8a184ec1657a" # 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