[PATCH 3/6] linux-yocto/5.10: restore aufs
From: Bruce Ashfield <hidden>
Date: 2021-06-16 20:49:00
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Bruce Ashfield <redacted>
Integrating the following commit(s) to linux-yocto/5.10:
bdda1b6cf99b aufs5: aufs-core
2fa276071d07 aufs5: aufs-standalone
06ed4d532456 aufs5: aufs-mmap
372857834999 aufs5: aufs-kbuild
fd68c9840693 aufs5: aufs-base
Signed-off-by: Bruce Ashfield <redacted>
---
.../linux/linux-yocto-rt_5.10.bb | 2 +-
.../linux/linux-yocto-tiny_5.10.bb | 4 ++--
meta/recipes-kernel/linux/linux-yocto_5.10.bb | 20 +++++++++----------
3 files changed, 13 insertions(+), 13 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 c34ce4d0f2..1a581455c6 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb@@ -11,7 +11,7 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "556236b4fc94b6655e3bd3018f17c3265e033f9e" +SRCREV_machine ?= "49f039aa59a182fb1451407616a6fcc1ec278537" SRCREV_meta ?= "422f8a09a856800f027bbae98dbab24cf3ae0f25" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
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 774461a2c1..53050dd225 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb@@ -15,8 +15,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "2940c362208b0f18baa6e2f455bd1c88b7c2eeca" -SRCREV_machine ?= "a673c127156c156a4a490ef66e0194d239cfbfa1" +SRCREV_machine_qemuarm ?= "03d62322242437d30f537fa01024730ddcaa4cde" +SRCREV_machine ?= "bdda1b6cf99b44871409d218426a28102a5c554b" SRCREV_meta ?= "422f8a09a856800f027bbae98dbab24cf3ae0f25" 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 b808a8ad3f..c18a79f912 100644
--- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb@@ -13,16 +13,16 @@ KBRANCH_qemux86 ?= "v5.10/standard/base" KBRANCH_qemux86-64 ?= "v5.10/standard/base" KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "af93f3c5ef33dfb378d78b455f7193602ae732a7" -SRCREV_machine_qemuarm64 ?= "a673c127156c156a4a490ef66e0194d239cfbfa1" -SRCREV_machine_qemumips ?= "158d19e8753b47a10cf28b27d8b9fe9d0a583c9e" -SRCREV_machine_qemuppc ?= "a673c127156c156a4a490ef66e0194d239cfbfa1" -SRCREV_machine_qemuriscv64 ?= "a673c127156c156a4a490ef66e0194d239cfbfa1" -SRCREV_machine_qemuriscv32 ?= "a673c127156c156a4a490ef66e0194d239cfbfa1" -SRCREV_machine_qemux86 ?= "a673c127156c156a4a490ef66e0194d239cfbfa1" -SRCREV_machine_qemux86-64 ?= "a673c127156c156a4a490ef66e0194d239cfbfa1" -SRCREV_machine_qemumips64 ?= "462641551c0563b755781845b5a315da205e6356" -SRCREV_machine ?= "a673c127156c156a4a490ef66e0194d239cfbfa1" +SRCREV_machine_qemuarm ?= "e62fcf364564354b6950338e09599c8c0ae9027d" +SRCREV_machine_qemuarm64 ?= "bdda1b6cf99b44871409d218426a28102a5c554b" +SRCREV_machine_qemumips ?= "3560351f3dc225aabbdd2aa44cd3d4e0f6971020" +SRCREV_machine_qemuppc ?= "bdda1b6cf99b44871409d218426a28102a5c554b" +SRCREV_machine_qemuriscv64 ?= "bdda1b6cf99b44871409d218426a28102a5c554b" +SRCREV_machine_qemuriscv32 ?= "bdda1b6cf99b44871409d218426a28102a5c554b" +SRCREV_machine_qemux86 ?= "bdda1b6cf99b44871409d218426a28102a5c554b" +SRCREV_machine_qemux86-64 ?= "bdda1b6cf99b44871409d218426a28102a5c554b" +SRCREV_machine_qemumips64 ?= "1bfe413ad99b88b366ff1451b69e0fc4b84188ea" +SRCREV_machine ?= "bdda1b6cf99b44871409d218426a28102a5c554b" SRCREV_meta ?= "422f8a09a856800f027bbae98dbab24cf3ae0f25" # remap qemuarm to qemuarma15 for the 5.8 kernel
--
2.19.1