summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2017-08-24 14:57:48 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-09-11 22:15:59 +0100
commitc18e8747f0a9bd0bc6175ab51b6644701731d06f (patch)
treef6aea4d6e01814142793541f570db1db673903da /meta
parent2e740c45839bb177bb18fa09410e72bac8486f90 (diff)
downloadpoky-c18e8747f0a9bd0bc6175ab51b6644701731d06f.tar.gz
linux-yocto/4.10: fix aufs build
The aufs patches were out of sync with the latest upstream and hence didn't build against 4.10. With this update, we are once again building and up to date with the upstream repo. (From OE-Core rev: b8b7aa0f64e46e7e8134a8bc33948e2bbe63380f) (From OE-Core rev: 35eebe3cf2c6190e1c13d5b828e3550fe798ba02) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@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_4.10.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_4.10.bb4
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_4.10.bb18
3 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_4.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_4.10.bb
index cc6e522b4b..d95a4f7301 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_4.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_4.10.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 ?= "65370fa249e282e4ce69cf927c01898b4c16f261" 14SRCREV_machine ?= "f4ba3db6e599ed41d1c676f9086ad8b97fd55046"
15SRCREV_meta ?= "6ac2680ca4316fe111cddec37def7757843bbe86" 15SRCREV_meta ?= "416a2862c3bac3ecb641bf14e14c1d2c9c23ed96"
16 16
17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.10.git;branch=${KBRANCH};name=machine \ 17SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.10.git;branch=${KBRANCH};name=machine \
18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.10;destsuffix=${KMETA}" 18 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.10;destsuffix=${KMETA}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_4.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_4.10.bb
index b136bf0950..cb13f4fbdc 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_4.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_4.10.bb
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "4.10.17"
9KMETA = "kernel-meta" 9KMETA = "kernel-meta"
10KCONF_BSP_AUDIT_LEVEL = "2" 10KCONF_BSP_AUDIT_LEVEL = "2"
11 11
12SRCREV_machine ?= "65370fa249e282e4ce69cf927c01898b4c16f261" 12SRCREV_machine ?= "f4ba3db6e599ed41d1c676f9086ad8b97fd55046"
13SRCREV_meta ?= "6ac2680ca4316fe111cddec37def7757843bbe86" 13SRCREV_meta ?= "416a2862c3bac3ecb641bf14e14c1d2c9c23ed96"
14 14
15PV = "${LINUX_VERSION}+git${SRCPV}" 15PV = "${LINUX_VERSION}+git${SRCPV}"
16 16
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.10.bb b/meta/recipes-kernel/linux/linux-yocto_4.10.bb
index 4107891f6e..10b56cda77 100644
--- a/meta/recipes-kernel/linux/linux-yocto_4.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_4.10.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 ?= "4c652d50c67050422da4621cc6421ecb86b31c31" 14SRCREV_machine_qemuarm ?= "97253eca8592c9cba7c7665277e1118b048b9639"
15SRCREV_machine_qemuarm64 ?= "65370fa249e282e4ce69cf927c01898b4c16f261" 15SRCREV_machine_qemuarm64 ?= "f4ba3db6e599ed41d1c676f9086ad8b97fd55046"
16SRCREV_machine_qemumips ?= "0a632fa7f9615ad1b2488a300846a7e925e6591a" 16SRCREV_machine_qemumips ?= "52e935b59800868731e7620caf49cc257f1b9946"
17SRCREV_machine_qemuppc ?= "65370fa249e282e4ce69cf927c01898b4c16f261" 17SRCREV_machine_qemuppc ?= "f4ba3db6e599ed41d1c676f9086ad8b97fd55046"
18SRCREV_machine_qemux86 ?= "65370fa249e282e4ce69cf927c01898b4c16f261" 18SRCREV_machine_qemux86 ?= "f4ba3db6e599ed41d1c676f9086ad8b97fd55046"
19SRCREV_machine_qemux86-64 ?= "65370fa249e282e4ce69cf927c01898b4c16f261" 19SRCREV_machine_qemux86-64 ?= "f4ba3db6e599ed41d1c676f9086ad8b97fd55046"
20SRCREV_machine_qemumips64 ?= "75c22c1be83bf7894af78a36b3e3c5af08ce4d7b" 20SRCREV_machine_qemumips64 ?= "7b6d7feb4b0143d6f9146784f6072ffd171dd7ba"
21SRCREV_machine ?= "65370fa249e282e4ce69cf927c01898b4c16f261" 21SRCREV_machine ?= "f4ba3db6e599ed41d1c676f9086ad8b97fd55046"
22SRCREV_meta ?= "6ac2680ca4316fe111cddec37def7757843bbe86" 22SRCREV_meta ?= "416a2862c3bac3ecb641bf14e14c1d2c9c23ed96"
23 23
24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.10.git;name=machine;branch=${KBRANCH}; \ 24SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.10.git;name=machine;branch=${KBRANCH}; \
25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.10;destsuffix=${KMETA}" 25 git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.10;destsuffix=${KMETA}"