diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2022-04-04 11:19:16 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-04-05 10:49:36 +0100 |
commit | fd22b5e48862adfa8f8a5df67a2fafe032f8cdd2 (patch) | |
tree | 724882556633af447afdbcc516339cf21b4c7b32 | |
parent | 5979a3928faa11d8c50836252733117a58f33fa4 (diff) | |
download | poky-fd22b5e48862adfa8f8a5df67a2fafe032f8cdd2.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: 294b49c51fbd775c712939c79ecfee219db2a405)
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>
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | 2 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.10.bb | 2 |
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 | ||
14 | SRCREV_machine ?= "40a6731993d406d6c9fed43cb20c6a4f178ff2cc" | 14 | SRCREV_machine ?= "40a6731993d406d6c9fed43cb20c6a4f178ff2cc" |
15 | SRCREV_meta ?= "1ae63728667964edf845b4f85bb6c06a55b81793" | 15 | SRCREV_meta ?= "2278ed571c14df6e87d8e01ac26f649d98020623" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_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 | ||
18 | SRCREV_machine:qemuarm ?= "9524d0ca0feeeb4cb698e3c984f4391ccb4b8e19" | 18 | SRCREV_machine:qemuarm ?= "9524d0ca0feeeb4cb698e3c984f4391ccb4b8e19" |
19 | SRCREV_machine ?= "bccf3a5f14511fb8ce6a9dd990216508d2c2ec6e" | 19 | SRCREV_machine ?= "bccf3a5f14511fb8ce6a9dd990216508d2c2ec6e" |
20 | SRCREV_meta ?= "1ae63728667964edf845b4f85bb6c06a55b81793" | 20 | SRCREV_meta ?= "2278ed571c14df6e87d8e01ac26f649d98020623" |
21 | 21 | ||
22 | PV = "${LINUX_VERSION}+git${SRCPV}" | 22 | PV = "${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" | |||
23 | SRCREV_machine:qemux86-64 ?= "d2f7a595bf0b752275d503046494b668549cb151" | 23 | SRCREV_machine:qemux86-64 ?= "d2f7a595bf0b752275d503046494b668549cb151" |
24 | SRCREV_machine:qemumips64 ?= "279f142932679a8ba212ebae4b9db851636a1fab" | 24 | SRCREV_machine:qemumips64 ?= "279f142932679a8ba212ebae4b9db851636a1fab" |
25 | SRCREV_machine ?= "d2f7a595bf0b752275d503046494b668549cb151" | 25 | SRCREV_machine ?= "d2f7a595bf0b752275d503046494b668549cb151" |
26 | SRCREV_meta ?= "1ae63728667964edf845b4f85bb6c06a55b81793" | 26 | SRCREV_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" |