From 1410b67bec84ed069742d21d7c12d0a3ca2013c7 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Thu, 12 Sep 2024 13:30:23 -0400 Subject: [PATCH] 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 Signed-off-by: Bruce Ashfield ] 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 Signed-off-by: Bruce Ashfield ] (From OE-Core rev: dcf2879bb3ac663509743c760042e93cbc5d447e) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_6.10.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_6.10.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_6.10.bb | 2 +- 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 () { } SRCREV_machine ?= "b8e8a499763e5f192540d76dcbed6b545b7dafc5" -SRCREV_meta ?= "4e1ceedd315bad5ebe5b8eb4df4238047ce2a894" +SRCREV_meta ?= "a9ca38a63029cdc0c92bb37d3156304bf0a17ad0" 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.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" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "1025debfd0d40f7f8d0547328bbf50ac543bdeba" -SRCREV_meta ?= "4e1ceedd315bad5ebe5b8eb4df4238047ce2a894" +SRCREV_meta ?= "a9ca38a63029cdc0c92bb37d3156304bf0a17ad0" PV = "${LINUX_VERSION}+git" 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" SRCREV_machine:qemux86-64 ?= "1025debfd0d40f7f8d0547328bbf50ac543bdeba" SRCREV_machine:qemumips64 ?= "5fdfe03b830e275d165d1bc655dd4a7b9072aecc" SRCREV_machine ?= "1025debfd0d40f7f8d0547328bbf50ac543bdeba" -SRCREV_meta ?= "4e1ceedd315bad5ebe5b8eb4df4238047ce2a894" +SRCREV_meta ?= "a9ca38a63029cdc0c92bb37d3156304bf0a17ad0" # 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