diff options
author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2021-06-09 10:54:30 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-06-11 23:50:58 +0100 |
commit | 176e62be47ff383be2fc6f8854af18b5679e0420 (patch) | |
tree | b3593abbe9a6b32ec9b873b97ab9027efd921f4c | |
parent | 7ccf66174fd146a1d3c7d7b37ac801f4abca586f (diff) | |
download | poky-176e62be47ff383be2fc6f8854af18b5679e0420.tar.gz |
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.
(From OE-Core rev: dcbe9e133f74ca804f877f90e9c8e3fa7b73b88e)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb | 4 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb | 6 | ||||
-rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_5.10.bb | 22 |
3 files changed, 16 insertions, 16 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 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 () { | |||
11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 11 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
12 | } | 12 | } |
13 | 13 | ||
14 | SRCREV_machine ?= "1a53b60abc0aebb4e7be89b3d17c755fc127c2ec" | 14 | SRCREV_machine ?= "556236b4fc94b6655e3bd3018f17c3265e033f9e" |
15 | SRCREV_meta ?= "38475332ee6749bc15f39cf0c22cd5aa2c0fddd0" | 15 | SRCREV_meta ?= "422f8a09a856800f027bbae98dbab24cf3ae0f25" |
16 | 16 | ||
17 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ | 17 | SRC_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.10;destsuffix=${KMETA}" | 18 | 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" | |||
15 | KMETA = "kernel-meta" | 15 | KMETA = "kernel-meta" |
16 | KCONF_BSP_AUDIT_LEVEL = "2" | 16 | KCONF_BSP_AUDIT_LEVEL = "2" |
17 | 17 | ||
18 | SRCREV_machine_qemuarm ?= "4ca63892af0a3fefae7c283e9b7bcca0e47fea91" | 18 | SRCREV_machine_qemuarm ?= "2940c362208b0f18baa6e2f455bd1c88b7c2eeca" |
19 | SRCREV_machine ?= "f09a5c524d12166be99bf465e3c0431d3aec80f2" | 19 | SRCREV_machine ?= "a673c127156c156a4a490ef66e0194d239cfbfa1" |
20 | SRCREV_meta ?= "38475332ee6749bc15f39cf0c22cd5aa2c0fddd0" | 20 | SRCREV_meta ?= "422f8a09a856800f027bbae98dbab24cf3ae0f25" |
21 | 21 | ||
22 | PV = "${LINUX_VERSION}+git${SRCPV}" | 22 | PV = "${LINUX_VERSION}+git${SRCPV}" |
23 | 23 | ||
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" | |||
13 | KBRANCH_qemux86-64 ?= "v5.10/standard/base" | 13 | KBRANCH_qemux86-64 ?= "v5.10/standard/base" |
14 | KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" | 14 | KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" |
15 | 15 | ||
16 | SRCREV_machine_qemuarm ?= "ce15f50ef5cf0d81f8539b2b7c728a5045f09161" | 16 | SRCREV_machine_qemuarm ?= "af93f3c5ef33dfb378d78b455f7193602ae732a7" |
17 | SRCREV_machine_qemuarm64 ?= "f09a5c524d12166be99bf465e3c0431d3aec80f2" | 17 | SRCREV_machine_qemuarm64 ?= "a673c127156c156a4a490ef66e0194d239cfbfa1" |
18 | SRCREV_machine_qemumips ?= "f1a8f73dd8680fc57aab5d8618a14b4e3a28587d" | 18 | SRCREV_machine_qemumips ?= "158d19e8753b47a10cf28b27d8b9fe9d0a583c9e" |
19 | SRCREV_machine_qemuppc ?= "f09a5c524d12166be99bf465e3c0431d3aec80f2" | 19 | SRCREV_machine_qemuppc ?= "a673c127156c156a4a490ef66e0194d239cfbfa1" |
20 | SRCREV_machine_qemuriscv64 ?= "f09a5c524d12166be99bf465e3c0431d3aec80f2" | 20 | SRCREV_machine_qemuriscv64 ?= "a673c127156c156a4a490ef66e0194d239cfbfa1" |
21 | SRCREV_machine_qemuriscv32 ?= "f09a5c524d12166be99bf465e3c0431d3aec80f2" | 21 | SRCREV_machine_qemuriscv32 ?= "a673c127156c156a4a490ef66e0194d239cfbfa1" |
22 | SRCREV_machine_qemux86 ?= "f09a5c524d12166be99bf465e3c0431d3aec80f2" | 22 | SRCREV_machine_qemux86 ?= "a673c127156c156a4a490ef66e0194d239cfbfa1" |
23 | SRCREV_machine_qemux86-64 ?= "f09a5c524d12166be99bf465e3c0431d3aec80f2" | 23 | SRCREV_machine_qemux86-64 ?= "a673c127156c156a4a490ef66e0194d239cfbfa1" |
24 | SRCREV_machine_qemumips64 ?= "d8c0cf01dfa28b3271606f942df69a12c8d23a95" | 24 | SRCREV_machine_qemumips64 ?= "462641551c0563b755781845b5a315da205e6356" |
25 | SRCREV_machine ?= "f09a5c524d12166be99bf465e3c0431d3aec80f2" | 25 | SRCREV_machine ?= "a673c127156c156a4a490ef66e0194d239cfbfa1" |
26 | SRCREV_meta ?= "38475332ee6749bc15f39cf0c22cd5aa2c0fddd0" | 26 | SRCREV_meta ?= "422f8a09a856800f027bbae98dbab24cf3ae0f25" |
27 | 27 | ||
28 | # remap qemuarm to qemuarma15 for the 5.8 kernel | 28 | # remap qemuarm to qemuarma15 for the 5.8 kernel |
29 | # KMACHINE_qemuarm ?= "qemuarma15" | 29 | # KMACHINE_qemuarm ?= "qemuarma15" |