From c8bfdc0ac6a5bb26adb59949be5cd0f00a67cb79 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 22 Mar 2022 13:19:51 -0400 Subject: linux-yocto/5.10: split vtpm for more granular inclusion Integrating the following commit(s) to linux-yocto/.: 6ca1d510a03 features/tpm: split into tpm-1.2, tpm-2.0, tpm-2.0-crb and vtpm feature Signed-off-by: Stefan Herbrechtsmeier Signed-off-by: Bruce Ashfield Signed-off-by: Alexandre Belloni (cherry picked from commit b61be908468b1057a9d2baf40c1ebfbbd74732b8) Signed-off-by: Anuj Mittal --- meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | 2 +- 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 4d75cf1b21..a35e80940e 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 () { } SRCREV_machine ?= "e0d87d9831a6e0df20a370adc9aba0d032d91661" -SRCREV_meta ?= "792f1272dd0d68d5dba0ff35949b2094f818227e" +SRCREV_meta ?= "b814c7ebf2a92fc361bcbeaf6efdd40b8cd0816a" 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.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 8227d5d8cc..45cfd90e0a 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" SRCREV_machine_qemuarm ?= "38f8b1b5b87959e6cb9367151e233d27befe015d" SRCREV_machine ?= "cc70f051e56005acda2e6ea994cadfb2538e66f6" -SRCREV_meta ?= "792f1272dd0d68d5dba0ff35949b2094f818227e" +SRCREV_meta ?= "b814c7ebf2a92fc361bcbeaf6efdd40b8cd0816a" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index 5a4939cf36..fdc985af13 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 ?= "e6c8ebd210a2ab7817618bb4c518d69d35d16cf7" SRCREV_machine_qemux86-64 ?= "e6c8ebd210a2ab7817618bb4c518d69d35d16cf7" SRCREV_machine_qemumips64 ?= "a1b43f69bce61143dd4d6d637f619eadd3fabb6e" SRCREV_machine ?= "e6c8ebd210a2ab7817618bb4c518d69d35d16cf7" -SRCREV_meta ?= "792f1272dd0d68d5dba0ff35949b2094f818227e" +SRCREV_meta ?= "b814c7ebf2a92fc361bcbeaf6efdd40b8cd0816a" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE_qemuarm ?= "qemuarma15" -- cgit 1.2.3-korg