diff options
| author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2023-11-08 09:16:27 -0500 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2023-12-15 03:54:00 -1000 |
| commit | 07719f4afa2528a1d7ce4b56c8ac91a3b9d01e5a (patch) | |
| tree | 112d145265236964f1c7923b9a4730d2b1f0bc29 /meta | |
| parent | e96278affc93601cc385beeabc90c83df2a428bd (diff) | |
| download | poky-07719f4afa2528a1d7ce4b56c8ac91a3b9d01e5a.tar.gz | |
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 <cam@myfastmail.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
]
(From OE-Core rev: 5567b76143d5b6c49c97aa90e518a3c1129b2b5f)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit dfc0cc113eabb1160b6bfd630fa75c6a3cb9c7a5)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta')
| -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 6ebf533bb0..408fac718e 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 ?= "0dad5306907b9e6fb89103dfba80dbd0edafcdb6" | 17 | SRCREV_machine ?= "0dad5306907b9e6fb89103dfba80dbd0edafcdb6" |
| 18 | SRCREV_meta ?= "0553e01ca003e82d32d9b85c0275568e8ce67274" | 18 | SRCREV_meta ?= "3ec1b83af3b59f07cf04e1264fbd30fe2f2f873b" |
| 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 af98525c4f..9bf6001353 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 ?= "780d811bb97bf34f2be6cab28d5a8b099154c40d" | 20 | SRCREV_machine ?= "780d811bb97bf34f2be6cab28d5a8b099154c40d" |
| 21 | SRCREV_meta ?= "0553e01ca003e82d32d9b85c0275568e8ce67274" | 21 | SRCREV_meta ?= "3ec1b83af3b59f07cf04e1264fbd30fe2f2f873b" |
| 22 | 22 | ||
| 23 | PV = "${LINUX_VERSION}+git" | 23 | PV = "${LINUX_VERSION}+git" |
| 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 9f17f244f8..f497ccedd9 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" | |||
| 29 | SRCREV_machine:qemux86-64 ?= "780d811bb97bf34f2be6cab28d5a8b099154c40d" | 29 | SRCREV_machine:qemux86-64 ?= "780d811bb97bf34f2be6cab28d5a8b099154c40d" |
| 30 | SRCREV_machine:qemumips64 ?= "9f25eb5709ab8af0ece7306014d5e8b7c6150c68" | 30 | SRCREV_machine:qemumips64 ?= "9f25eb5709ab8af0ece7306014d5e8b7c6150c68" |
| 31 | SRCREV_machine ?= "780d811bb97bf34f2be6cab28d5a8b099154c40d" | 31 | SRCREV_machine ?= "780d811bb97bf34f2be6cab28d5a8b099154c40d" |
| 32 | SRCREV_meta ?= "0553e01ca003e82d32d9b85c0275568e8ce67274" | 32 | SRCREV_meta ?= "3ec1b83af3b59f07cf04e1264fbd30fe2f2f873b" |
| 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 |
