summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2023-11-02 17:55:36 -0400
committerSteve Sakoman <steve@sakoman.com>2023-12-15 03:54:00 -1000
commit6d7d4ccc054083f819d9243f278e8c670b6054f3 (patch)
tree31fab1a4e51a1e87259e7326ad4f5ce6c75d11eb
parent44d37517ed98d3fa3fd5260ff72554af67c9ec4f (diff)
downloadpoky-6d7d4ccc054083f819d9243f278e8c670b6054f3.tar.gz
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 <cam@myfastmail.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ] (From OE-Core rev: 98d448d05a3f4166569159756f8bfaac4ce358ab) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit c459be32000d703aad179a4bf5ef2479813f0404) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_6.5.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_6.5.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_6.5.bb2
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 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 () {
15} 15}
16 16
17SRCREV_machine ?= "a19b0be3292c96a0cc9c0ebb8f9d104d6a4d3e10" 17SRCREV_machine ?= "a19b0be3292c96a0cc9c0ebb8f9d104d6a4d3e10"
18SRCREV_meta ?= "6e1f2cc45e8c78278fea51b7cfd0bf1180e5605a" 18SRCREV_meta ?= "fa8ffc924f6d91ea09c9f792a5bb8a184ec1657a"
19 19
20SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ 20SRC_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 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"
18KCONF_BSP_AUDIT_LEVEL = "2" 18KCONF_BSP_AUDIT_LEVEL = "2"
19 19
20SRCREV_machine ?= "4e79d57b9c5cc230d2d8cb40c393515fedfed134" 20SRCREV_machine ?= "4e79d57b9c5cc230d2d8cb40c393515fedfed134"
21SRCREV_meta ?= "6e1f2cc45e8c78278fea51b7cfd0bf1180e5605a" 21SRCREV_meta ?= "fa8ffc924f6d91ea09c9f792a5bb8a184ec1657a"
22 22
23PV = "${LINUX_VERSION}+git" 23PV = "${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 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"
29SRCREV_machine:qemux86-64 ?= "11bbc8db249543905b6fe9b660575202fa0e3ed0" 29SRCREV_machine:qemux86-64 ?= "11bbc8db249543905b6fe9b660575202fa0e3ed0"
30SRCREV_machine:qemumips64 ?= "3b119ebc63b9889194b0125bfae96ee5830e538c" 30SRCREV_machine:qemumips64 ?= "3b119ebc63b9889194b0125bfae96ee5830e538c"
31SRCREV_machine ?= "11bbc8db249543905b6fe9b660575202fa0e3ed0" 31SRCREV_machine ?= "11bbc8db249543905b6fe9b660575202fa0e3ed0"
32SRCREV_meta ?= "6e1f2cc45e8c78278fea51b7cfd0bf1180e5605a" 32SRCREV_meta ?= "fa8ffc924f6d91ea09c9f792a5bb8a184ec1657a"
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