summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2024-09-12 13:30:23 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-09-13 07:15:49 +0100
commit1410b67bec84ed069742d21d7c12d0a3ca2013c7 (patch)
tree95a5e4da7ac53211a0d3288b5825f704702b5a42 /meta
parentf0e17a8f5ef9bfa314f1f1964da218f1b5381ff1 (diff)
downloadpoky-1410b67bec84ed069742d21d7c12d0a3ca2013c7.tar.gz
linux-yocto/6.10: cfg: arm64 configuration updates
Integrating the following commit(s) to linux-yocto/.: 1/2 [ Author: Ross Burton Email: ross.burton@arm.com Subject: features/security: fix Meltdown/Spectre configurations Date: Thu, 12 Sep 2024 16:42:50 +0100 These are both specific to x86 so move them into the x86 file, and were renamed to have a MITIGATION_ prefix in 6.9. Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ] 2/2 [ Author: Ross Burton Email: ross.burton@arm.com Subject: bsp/genericarm64: update for 6.10 kconfig symbol renames Date: Thu, 12 Sep 2024 16:42:51 +0100 Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ] (From OE-Core rev: dcf2879bb3ac663509743c760042e93cbc5d447e) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_6.10.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_6.10.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_6.10.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.10.bb
index 925666de23..b2e9071615 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_6.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.10.bb
@@ -15,7 +15,7 @@ python () {
15} 15}
16 16
17SRCREV_machine ?= "b8e8a499763e5f192540d76dcbed6b545b7dafc5" 17SRCREV_machine ?= "b8e8a499763e5f192540d76dcbed6b545b7dafc5"
18SRCREV_meta ?= "4e1ceedd315bad5ebe5b8eb4df4238047ce2a894" 18SRCREV_meta ?= "a9ca38a63029cdc0c92bb37d3156304bf0a17ad0"
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.10;destsuffix=${KMETA};protocol=https" 21 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.10;destsuffix=${KMETA};protocol=https"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.10.bb
index b569c4dcf5..62354201b0 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.10.bb
@@ -18,7 +18,7 @@ KMETA = "kernel-meta"
18KCONF_BSP_AUDIT_LEVEL = "2" 18KCONF_BSP_AUDIT_LEVEL = "2"
19 19
20SRCREV_machine ?= "1025debfd0d40f7f8d0547328bbf50ac543bdeba" 20SRCREV_machine ?= "1025debfd0d40f7f8d0547328bbf50ac543bdeba"
21SRCREV_meta ?= "4e1ceedd315bad5ebe5b8eb4df4238047ce2a894" 21SRCREV_meta ?= "a9ca38a63029cdc0c92bb37d3156304bf0a17ad0"
22 22
23PV = "${LINUX_VERSION}+git" 23PV = "${LINUX_VERSION}+git"
24 24
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.10.bb b/meta/recipes-kernel/linux/linux-yocto_6.10.bb
index b00081b240..0d3041b27a 100644
--- a/meta/recipes-kernel/linux/linux-yocto_6.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_6.10.bb
@@ -29,7 +29,7 @@ SRCREV_machine:qemux86 ?= "1025debfd0d40f7f8d0547328bbf50ac543bdeba"
29SRCREV_machine:qemux86-64 ?= "1025debfd0d40f7f8d0547328bbf50ac543bdeba" 29SRCREV_machine:qemux86-64 ?= "1025debfd0d40f7f8d0547328bbf50ac543bdeba"
30SRCREV_machine:qemumips64 ?= "5fdfe03b830e275d165d1bc655dd4a7b9072aecc" 30SRCREV_machine:qemumips64 ?= "5fdfe03b830e275d165d1bc655dd4a7b9072aecc"
31SRCREV_machine ?= "1025debfd0d40f7f8d0547328bbf50ac543bdeba" 31SRCREV_machine ?= "1025debfd0d40f7f8d0547328bbf50ac543bdeba"
32SRCREV_meta ?= "4e1ceedd315bad5ebe5b8eb4df4238047ce2a894" 32SRCREV_meta ?= "a9ca38a63029cdc0c92bb37d3156304bf0a17ad0"
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