summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@gmail.com>2021-06-16 16:48:51 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-06-17 13:42:31 +0100
commit42d5046057be1746eb86b4efd6c67d14a5d7d3b2 (patch)
tree82ff0020738b7082d87630b900e1d8ef8270cadb /meta
parentc619e880c792ba88efa2c245f3ec3632f1aba3b4 (diff)
downloadpoky-42d5046057be1746eb86b4efd6c67d14a5d7d3b2.tar.gz
linux-yocto/5.10: restore aufs
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 (From OE-Core rev: abe04529947d922c025853b71379d5ac7ff20238) Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb2
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_5.10.bb20
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 () {
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 ?= "556236b4fc94b6655e3bd3018f17c3265e033f9e" 14SRCREV_machine ?= "49f039aa59a182fb1451407616a6fcc1ec278537"
15SRCREV_meta ?= "422f8a09a856800f027bbae98dbab24cf3ae0f25" 15SRCREV_meta ?= "422f8a09a856800f027bbae98dbab24cf3ae0f25"
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 \
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"
15KMETA = "kernel-meta" 15KMETA = "kernel-meta"
16KCONF_BSP_AUDIT_LEVEL = "2" 16KCONF_BSP_AUDIT_LEVEL = "2"
17 17
18SRCREV_machine_qemuarm ?= "2940c362208b0f18baa6e2f455bd1c88b7c2eeca" 18SRCREV_machine_qemuarm ?= "03d62322242437d30f537fa01024730ddcaa4cde"
19SRCREV_machine ?= "a673c127156c156a4a490ef66e0194d239cfbfa1" 19SRCREV_machine ?= "bdda1b6cf99b44871409d218426a28102a5c554b"
20SRCREV_meta ?= "422f8a09a856800f027bbae98dbab24cf3ae0f25" 20SRCREV_meta ?= "422f8a09a856800f027bbae98dbab24cf3ae0f25"
21 21
22PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${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"
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 ?= "af93f3c5ef33dfb378d78b455f7193602ae732a7" 16SRCREV_machine_qemuarm ?= "e62fcf364564354b6950338e09599c8c0ae9027d"
17SRCREV_machine_qemuarm64 ?= "a673c127156c156a4a490ef66e0194d239cfbfa1" 17SRCREV_machine_qemuarm64 ?= "bdda1b6cf99b44871409d218426a28102a5c554b"
18SRCREV_machine_qemumips ?= "158d19e8753b47a10cf28b27d8b9fe9d0a583c9e" 18SRCREV_machine_qemumips ?= "3560351f3dc225aabbdd2aa44cd3d4e0f6971020"
19SRCREV_machine_qemuppc ?= "a673c127156c156a4a490ef66e0194d239cfbfa1" 19SRCREV_machine_qemuppc ?= "bdda1b6cf99b44871409d218426a28102a5c554b"
20SRCREV_machine_qemuriscv64 ?= "a673c127156c156a4a490ef66e0194d239cfbfa1" 20SRCREV_machine_qemuriscv64 ?= "bdda1b6cf99b44871409d218426a28102a5c554b"
21SRCREV_machine_qemuriscv32 ?= "a673c127156c156a4a490ef66e0194d239cfbfa1" 21SRCREV_machine_qemuriscv32 ?= "bdda1b6cf99b44871409d218426a28102a5c554b"
22SRCREV_machine_qemux86 ?= "a673c127156c156a4a490ef66e0194d239cfbfa1" 22SRCREV_machine_qemux86 ?= "bdda1b6cf99b44871409d218426a28102a5c554b"
23SRCREV_machine_qemux86-64 ?= "a673c127156c156a4a490ef66e0194d239cfbfa1" 23SRCREV_machine_qemux86-64 ?= "bdda1b6cf99b44871409d218426a28102a5c554b"
24SRCREV_machine_qemumips64 ?= "462641551c0563b755781845b5a315da205e6356" 24SRCREV_machine_qemumips64 ?= "1bfe413ad99b88b366ff1451b69e0fc4b84188ea"
25SRCREV_machine ?= "a673c127156c156a4a490ef66e0194d239cfbfa1" 25SRCREV_machine ?= "bdda1b6cf99b44871409d218426a28102a5c554b"
26SRCREV_meta ?= "422f8a09a856800f027bbae98dbab24cf3ae0f25" 26SRCREV_meta ?= "422f8a09a856800f027bbae98dbab24cf3ae0f25"
27 27
28# remap qemuarm to qemuarma15 for the 5.8 kernel 28# remap qemuarm to qemuarma15 for the 5.8 kernel