summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2017-12-24 00:11:03 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-28 10:14:01 +0000
commit4dcd83a7186e113a8e4db903839904549af02284 (patch)
tree6804cea9deabdee7c55ccb2f562252abac47035f /meta
parentff134d6e0bff97049a3b29ff522767cf876d9c66 (diff)
downloadpoky-4dcd83a7186e113a8e4db903839904549af02284.tar.gz
linux-yocto/4.9: fix aufs build
The aufs4 core code was missing some changes to build against the 4.9 fs subsystem. This commit resyncs with the upstream repo, and we can once again build against 4.9. (From OE-Core rev: b530ab2d3ab28aded6ec86e6f8a6d9be45532361) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.9.bb18
3 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
index 4ab444fcbc..5e6f054b55 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.9.bb
@@ -11,8 +11,8 @@ python () {
11 raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") 11 raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
12} 12}
13 13
14SRCREV_machine ?= "56b06caa70f42d31067f33204a89417b3818aa77" 14SRCREV_machine ?= "c83e63d1a6da1218b61d352a866bc174554f71a9"
15SRCREV_meta ?= "d15398f64655e36b444d69b3bed43444608abf55" 15SRCREV_meta ?= "a2dfb1610d9dad34652a3c27c6c9d8751ed67af6"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
index 3e67029775..398209ef9a 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.9.bb
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.9.71"
9KMETA = "kernel-meta" 9KMETA = "kernel-meta"
10KCONF_BSP_AUDIT_LEVEL = "2" 10KCONF_BSP_AUDIT_LEVEL = "2"
11 11
12SRCREV_machine ?= "3061011aade2678733665bccd553fdcd60165671" 12SRCREV_machine ?= "a87b8d53730b5736575c738390abc498a31ba735"
13SRCREV_meta ?= "d15398f64655e36b444d69b3bed43444608abf55" 13SRCREV_meta ?= "a2dfb1610d9dad34652a3c27c6c9d8751ed67af6"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
16 16
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.9.bb b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
index e97355cbca..1fdd7bf1d5 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.9.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.9.bb
@@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "standard/base"
11KBRANCH_qemux86-64 ?= "standard/base" 11KBRANCH_qemux86-64 ?= "standard/base"
12KBRANCH_qemumips64 ?= "standard/mti-malta64" 12KBRANCH_qemumips64 ?= "standard/mti-malta64"
13 13
14SRCREV_machine_qemuarm ?= "0638cb025fd0d8192dbc0acc09018d6fec9f1597" 14SRCREV_machine_qemuarm ?= "7e0dc801cf0ab19827fd33214fe6036d80258653"
15SRCREV_machine_qemuarm64 ?= "3061011aade2678733665bccd553fdcd60165671" 15SRCREV_machine_qemuarm64 ?= "a87b8d53730b5736575c738390abc498a31ba735"
16SRCREV_machine_qemumips ?= "a8971e1548188eb07b88896c7f9d590abb92ed98" 16SRCREV_machine_qemumips ?= "69371c276be034fff40b5652184401d8dc2262a1"
17SRCREV_machine_qemuppc ?= "3061011aade2678733665bccd553fdcd60165671" 17SRCREV_machine_qemuppc ?= "a87b8d53730b5736575c738390abc498a31ba735"
18SRCREV_machine_qemux86 ?= "3061011aade2678733665bccd553fdcd60165671" 18SRCREV_machine_qemux86 ?= "a87b8d53730b5736575c738390abc498a31ba735"
19SRCREV_machine_qemux86-64 ?= "3061011aade2678733665bccd553fdcd60165671" 19SRCREV_machine_qemux86-64 ?= "a87b8d53730b5736575c738390abc498a31ba735"
20SRCREV_machine_qemumips64 ?= "3cff06df7c72b53af99045fcbcdaf2f9285adc1a" 20SRCREV_machine_qemumips64 ?= "b3159328d2dd0c53cf81b702c4f9cd520649c84a"
21SRCREV_machine ?= "3061011aade2678733665bccd553fdcd60165671" 21SRCREV_machine ?= "a87b8d53730b5736575c738390abc498a31ba735"
22SRCREV_meta ?= "d15398f64655e36b444d69b3bed43444608abf55" 22SRCREV_meta ?= "a2dfb1610d9dad34652a3c27c6c9d8751ed67af6"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;name=machine;branch=${KBRANCH}; \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.9.git;name=machine;branch=${KBRANCH}; \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}" 25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.9;destsuffix=${KMETA}"