summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2021-05-03 08:54:27 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-05-11 12:02:29 +0100
commit01f537542e02d4088ff46b5fd7152b5f781f1442 (patch)
tree1175da9eab34606aa598171184a62de3bdcd39a6
parent230bfb139925c310778720e5767c0c892e835934 (diff)
downloadpoky-01f537542e02d4088ff46b5fd7152b5f781f1442.tar.gz
linux-yocto/5.10: aufs fixes
It was reported that aufs was behaving incorrectly on arm/x86. Although we don't have an exact fix for the issues, the Wind River guys were able to come up with a minimal patch set to fix just the core issue, versus a full aufs uprev. We didn't have time to get this in before the release, but picking it up in a dot release is sufficient. (given that it took several months for the issue to be noticed). Integrating the following commit(s) to linux-yocto/5.10: a8808e541750 aufs: linux-v5.10-rc1, no more f_op->read() and ->write() cb1c41dac775 for aufs: linux-v5.10-rc1, no more vfs_(read|write)f_t a5805df6583f aufs: linux-v5.10-rc1, no more set_fs() 64e145dcca8c Revert "aufs: initial port to v5.10" (From OE-Core rev: 98ae1dd5c60a8f6ca30e80726c81f9fa0fc5d4cb) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit c290adec4e27f5d7987193e9a0749082f3ed3e20) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.10.bb22
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 dacff74bce..c491eed163 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
14SRCREV_machine ?= "ac98a75ef2bc550f67454bd738ede581c8846ff3" 14SRCREV_machine ?= "196677064883beeaacb68de437512a0e4ee07050"
15SRCREV_meta ?= "40a967b115fdbac34fc980d0e27ac2373a031189" 15SRCREV_meta ?= "8f16b5cfe0600f2a7ed1ce68633a88a1196b9776"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ 17SRC_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 21a2e89115..0e3771461b 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"
15KMETA = "kernel-meta" 15KMETA = "kernel-meta"
16KCONF_BSP_AUDIT_LEVEL = "2" 16KCONF_BSP_AUDIT_LEVEL = "2"
17 17
18SRCREV_machine_qemuarm ?= "ee7efde0c94e8b2eba1a5a2709f2d21874ac7525" 18SRCREV_machine_qemuarm ?= "bcb76d132fb1e90f6db0a598b3c46b180a9b71ea"
19SRCREV_machine ?= "8465e471f5b4855d01012a18cd5fa516061c0358" 19SRCREV_machine ?= "a8808e541750d4ed34105f615e295f6fbd9950fa"
20SRCREV_meta ?= "40a967b115fdbac34fc980d0e27ac2373a031189" 20SRCREV_meta ?= "8f16b5cfe0600f2a7ed1ce68633a88a1196b9776"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${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 e6859a2319..2221e99f3c 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"
13KBRANCH_qemux86-64 ?= "v5.10/standard/base" 13KBRANCH_qemux86-64 ?= "v5.10/standard/base"
14KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" 14KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64"
15 15
16SRCREV_machine_qemuarm ?= "4f13e8499f2bfc9d95dcc70b981ea16351ff088b" 16SRCREV_machine_qemuarm ?= "68066f8eb689b650bc95dd5abbba2336e11ca896"
17SRCREV_machine_qemuarm64 ?= "8465e471f5b4855d01012a18cd5fa516061c0358" 17SRCREV_machine_qemuarm64 ?= "a8808e541750d4ed34105f615e295f6fbd9950fa"
18SRCREV_machine_qemumips ?= "64f8949180b1a6375abef20eebf735e853701c71" 18SRCREV_machine_qemumips ?= "e609eb0cc21b9037f0adf73dfb524d4e44d0f51c"
19SRCREV_machine_qemuppc ?= "8465e471f5b4855d01012a18cd5fa516061c0358" 19SRCREV_machine_qemuppc ?= "a8808e541750d4ed34105f615e295f6fbd9950fa"
20SRCREV_machine_qemuriscv64 ?= "d6e20b2257ecfa6e796a45a4175863862a28fa11" 20SRCREV_machine_qemuriscv64 ?= "a8808e541750d4ed34105f615e295f6fbd9950fa"
21SRCREV_machine_qemuriscv32 ?= "d6e20b2257ecfa6e796a45a4175863862a28fa11" 21SRCREV_machine_qemuriscv32 ?= "a8808e541750d4ed34105f615e295f6fbd9950fa"
22SRCREV_machine_qemux86 ?= "d6e20b2257ecfa6e796a45a4175863862a28fa11" 22SRCREV_machine_qemux86 ?= "a8808e541750d4ed34105f615e295f6fbd9950fa"
23SRCREV_machine_qemux86-64 ?= "d6e20b2257ecfa6e796a45a4175863862a28fa11" 23SRCREV_machine_qemux86-64 ?= "a8808e541750d4ed34105f615e295f6fbd9950fa"
24SRCREV_machine_qemumips64 ?= "6bf49ed9b223173d918b7c0140b8d0561bc2674c" 24SRCREV_machine_qemumips64 ?= "f89a64b85a068ac96ccd69f5170b2fbe957d4162"
25SRCREV_machine ?= "d6e20b2257ecfa6e796a45a4175863862a28fa11" 25SRCREV_machine ?= "a8808e541750d4ed34105f615e295f6fbd9950fa"
26SRCREV_meta ?= "40a967b115fdbac34fc980d0e27ac2373a031189" 26SRCREV_meta ?= "8f16b5cfe0600f2a7ed1ce68633a88a1196b9776"
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"