summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2022-04-04 11:19:15 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-04-05 10:49:36 +0100
commit5979a3928faa11d8c50836252733117a58f33fa4 (patch)
tree52f0dcfa996a1a598e678544c212b0ba05445cf7
parent3a2b9dfa75c222db9ba08de7cdd08a242c143379 (diff)
downloadpoky-5979a3928faa11d8c50836252733117a58f33fa4.tar.gz
linux-yocto/5.15: features/security: Move x86_64 configs to separate file
Integrating the following commit(s) to linux-yocto/.: 63e25b57177 features/security: Move x86_64 configs to separate file (From OE-Core rev: 1927094f0daed50274eacb5a18f58960196119e0) 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.15.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.15.bb2
3 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
index 73a720d348..87ccfc1f45 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb
@@ -12,7 +12,7 @@ python () {
12} 12}
13 13
14SRCREV_machine ?= "29d051cc421a76432897019edc33edae35b16e39" 14SRCREV_machine ?= "29d051cc421a76432897019edc33edae35b16e39"
15SRCREV_meta ?= "7dd85143b4ed77bdcb6628ac8ea69917e1cd29e5" 15SRCREV_meta ?= "63e25b5717751b4b33685bd5991d10c52934a4c6"
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.15;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
index d5b301b4d5..d8ce5dc518 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
17 17
18SRCREV_machine:qemuarm ?= "cc9e92e826af229b841fcaf8c645e638a86eba43" 18SRCREV_machine:qemuarm ?= "cc9e92e826af229b841fcaf8c645e638a86eba43"
19SRCREV_machine ?= "c3d54a67cbf3fb8e6df2d88c80e9d2c74f69aba4" 19SRCREV_machine ?= "c3d54a67cbf3fb8e6df2d88c80e9d2c74f69aba4"
20SRCREV_meta ?= "7dd85143b4ed77bdcb6628ac8ea69917e1cd29e5" 20SRCREV_meta ?= "63e25b5717751b4b33685bd5991d10c52934a4c6"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"
23 23
diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
index b936257aa7..54157fd245 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb
@@ -23,7 +23,7 @@ SRCREV_machine:qemux86 ?= "c9f3902d8069e32a8928153a38d8f6115194d128"
23SRCREV_machine:qemux86-64 ?= "c9f3902d8069e32a8928153a38d8f6115194d128" 23SRCREV_machine:qemux86-64 ?= "c9f3902d8069e32a8928153a38d8f6115194d128"
24SRCREV_machine:qemumips64 ?= "a4805fe749c9c56d18a60b5378674760ef0e85ed" 24SRCREV_machine:qemumips64 ?= "a4805fe749c9c56d18a60b5378674760ef0e85ed"
25SRCREV_machine ?= "c9f3902d8069e32a8928153a38d8f6115194d128" 25SRCREV_machine ?= "c9f3902d8069e32a8928153a38d8f6115194d128"
26SRCREV_meta ?= "7dd85143b4ed77bdcb6628ac8ea69917e1cd29e5" 26SRCREV_meta ?= "63e25b5717751b4b33685bd5991d10c52934a4c6"
27 27
28# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll 28# set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll
29# get the <version>/base branch, which is pure upstream -stable, and the same 29# get the <version>/base branch, which is pure upstream -stable, and the same