summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2022-04-04 11:19:16 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-06-01 11:20:24 +0100
commite87c8d0eda4afe9d748b4c5a6a2a59c5fde20970 (patch)
treea36fda563788f38f8a4b1f79c56a1278bfe4fd75
parente28a432c27a5d0b75d01025f1153fa6727a4c307 (diff)
downloadpoky-e87c8d0eda4afe9d748b4c5a6a2a59c5fde20970.tar.gz
linux-yocto/5.10: features/security: Move x86_64 configs to separate file
Integrating the following commit(s) to linux-yocto/.: 2278ed571c1 features/security: Move x86_64 configs to separate file (From OE-Core rev: 01505cad0a0fd4ac64b3b98b1b2c867b0044e69f) Signed-off-by: Kamil Dziezyk <kamil.dziezyk@arm.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 294b49c51fbd775c712939c79ecfee219db2a405) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.10.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
index 9b125a92ef..3ff54b9ebb 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
@@ -12,7 +12,7 @@ python () {
12} 12}
13 13
14SRCREV_machine ?= "40a6731993d406d6c9fed43cb20c6a4f178ff2cc" 14SRCREV_machine ?= "40a6731993d406d6c9fed43cb20c6a4f178ff2cc"
15SRCREV_meta ?= "1ae63728667964edf845b4f85bb6c06a55b81793" 15SRCREV_meta ?= "2278ed571c14df6e87d8e01ac26f649d98020623"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
index 98ac869e79..bbaa0ebc00 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
17 17
18SRCREV_machine:qemuarm ?= "9524d0ca0feeeb4cb698e3c984f4391ccb4b8e19" 18SRCREV_machine:qemuarm ?= "9524d0ca0feeeb4cb698e3c984f4391ccb4b8e19"
19SRCREV_machine ?= "bccf3a5f14511fb8ce6a9dd990216508d2c2ec6e" 19SRCREV_machine ?= "bccf3a5f14511fb8ce6a9dd990216508d2c2ec6e"
20SRCREV_meta ?= "1ae63728667964edf845b4f85bb6c06a55b81793" 20SRCREV_meta ?= "2278ed571c14df6e87d8e01ac26f649d98020623"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"
23 23
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
index 74fd0ad21c..0cf14b748f 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb
@@ -23,7 +23,7 @@ SRCREV_machine:qemux86 ?= "d2f7a595bf0b752275d503046494b668549cb151"
23SRCREV_machine:qemux86-64 ?= "d2f7a595bf0b752275d503046494b668549cb151" 23SRCREV_machine:qemux86-64 ?= "d2f7a595bf0b752275d503046494b668549cb151"
24SRCREV_machine:qemumips64 ?= "279f142932679a8ba212ebae4b9db851636a1fab" 24SRCREV_machine:qemumips64 ?= "279f142932679a8ba212ebae4b9db851636a1fab"
25SRCREV_machine ?= "d2f7a595bf0b752275d503046494b668549cb151" 25SRCREV_machine ?= "d2f7a595bf0b752275d503046494b668549cb151"
26SRCREV_meta ?= "1ae63728667964edf845b4f85bb6c06a55b81793" 26SRCREV_meta ?= "2278ed571c14df6e87d8e01ac26f649d98020623"
27 27
28# remap qemuarm to qemuarma15 for the 5.8 kernel 28# remap qemuarm to qemuarma15 for the 5.8 kernel
29# KMACHINE:qemuarm ?= "qemuarma15" 29# KMACHINE:qemuarm ?= "qemuarma15"