From 1927094f0daed50274eacb5a18f58960196119e0 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 4 Apr 2022 11:19:15 -0400 Subject: 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 Signed-off-by: Kamil Dziezyk Signed-off-by: Bruce Ashfield Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 2 +- 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 () { } SRCREV_machine ?= "29d051cc421a76432897019edc33edae35b16e39" -SRCREV_meta ?= "7dd85143b4ed77bdcb6628ac8ea69917e1cd29e5" +SRCREV_meta ?= "63e25b5717751b4b33685bd5991d10c52934a4c6" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 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" SRCREV_machine:qemuarm ?= "cc9e92e826af229b841fcaf8c645e638a86eba43" SRCREV_machine ?= "c3d54a67cbf3fb8e6df2d88c80e9d2c74f69aba4" -SRCREV_meta ?= "7dd85143b4ed77bdcb6628ac8ea69917e1cd29e5" +SRCREV_meta ?= "63e25b5717751b4b33685bd5991d10c52934a4c6" PV = "${LINUX_VERSION}+git${SRCPV}" 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" SRCREV_machine:qemux86-64 ?= "c9f3902d8069e32a8928153a38d8f6115194d128" SRCREV_machine:qemumips64 ?= "a4805fe749c9c56d18a60b5378674760ef0e85ed" SRCREV_machine ?= "c9f3902d8069e32a8928153a38d8f6115194d128" -SRCREV_meta ?= "7dd85143b4ed77bdcb6628ac8ea69917e1cd29e5" +SRCREV_meta ?= "63e25b5717751b4b33685bd5991d10c52934a4c6" # 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 -- cgit 1.2.3-korg