From dcbe9e133f74ca804f877f90e9c8e3fa7b73b88e Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Wed, 9 Jun 2021 10:54:30 -0400 Subject: linux-yocto/5.10: temporarily revert aufs Integrating the following commit(s) to linux-yocto/5.10: a673c127156c Revert "aufs5: core" cf62bfcde384 Revert "aufs5: aufs5-base" a644419ec785 Revert "aufs5: aufs5-mmap" b893f9a999bb Revert "aufs5: aufs5-standalone" c60db0819480 Revert "aufs: initial port to v5.10" c66a5900f139 Revert "Revert "aufs: initial port to v5.10"" 1320cf58f5dd Revert "aufs: linux-v5.10-rc1, no more set_fs()" 02349d7738ff Revert "for aufs: linux-v5.10-rc1, no more vfs_(read|write)f_t" f01dab74750c Revert "aufs: linux-v5.10-rc1, no more f_op->read() and ->write()" 3d5de709b676 Revert "aufs5: aufs5-kbuild" If this doesn't fix instability, we'll restore the functionality. Work to isolate issues with aufs5 will continue at the same time. Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie --- meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto_5.10.bb | 22 +++++++++++----------- 3 files changed, 16 insertions(+), 16 deletions(-) (limited to 'meta/recipes-kernel') 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 9fb881c6c8..c34ce4d0f2 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -11,8 +11,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "1a53b60abc0aebb4e7be89b3d17c755fc127c2ec" -SRCREV_meta ?= "38475332ee6749bc15f39cf0c22cd5aa2c0fddd0" +SRCREV_machine ?= "556236b4fc94b6655e3bd3018f17c3265e033f9e" +SRCREV_meta ?= "422f8a09a856800f027bbae98dbab24cf3ae0f25" 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 5b567b98bc..774461a2c1 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "4ca63892af0a3fefae7c283e9b7bcca0e47fea91" -SRCREV_machine ?= "f09a5c524d12166be99bf465e3c0431d3aec80f2" -SRCREV_meta ?= "38475332ee6749bc15f39cf0c22cd5aa2c0fddd0" +SRCREV_machine_qemuarm ?= "2940c362208b0f18baa6e2f455bd1c88b7c2eeca" +SRCREV_machine ?= "a673c127156c156a4a490ef66e0194d239cfbfa1" +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 583abdb5ad..b808a8ad3f 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -13,17 +13,17 @@ KBRANCH_qemux86 ?= "v5.10/standard/base" KBRANCH_qemux86-64 ?= "v5.10/standard/base" KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "ce15f50ef5cf0d81f8539b2b7c728a5045f09161" -SRCREV_machine_qemuarm64 ?= "f09a5c524d12166be99bf465e3c0431d3aec80f2" -SRCREV_machine_qemumips ?= "f1a8f73dd8680fc57aab5d8618a14b4e3a28587d" -SRCREV_machine_qemuppc ?= "f09a5c524d12166be99bf465e3c0431d3aec80f2" -SRCREV_machine_qemuriscv64 ?= "f09a5c524d12166be99bf465e3c0431d3aec80f2" -SRCREV_machine_qemuriscv32 ?= "f09a5c524d12166be99bf465e3c0431d3aec80f2" -SRCREV_machine_qemux86 ?= "f09a5c524d12166be99bf465e3c0431d3aec80f2" -SRCREV_machine_qemux86-64 ?= "f09a5c524d12166be99bf465e3c0431d3aec80f2" -SRCREV_machine_qemumips64 ?= "d8c0cf01dfa28b3271606f942df69a12c8d23a95" -SRCREV_machine ?= "f09a5c524d12166be99bf465e3c0431d3aec80f2" -SRCREV_meta ?= "38475332ee6749bc15f39cf0c22cd5aa2c0fddd0" +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_meta ?= "422f8a09a856800f027bbae98dbab24cf3ae0f25" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE_qemuarm ?= "qemuarma15" -- cgit 1.2.3-korg