From: Bruce Ashfield <bruce.ashfield@windriver.com>
Date: Thu, 24 Aug 2017 18:57:48 +0000 (-0400)
Subject: linux-yocto/4.10: fix aufs build
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~20153
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8b7aa0f64e46e7e8134a8bc33948e2bbe63380f;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---

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 cc6e522b4b8..d95a4f73019 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 () {
         raise bb.parse.SkipPackage("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "65370fa249e282e4ce69cf927c01898b4c16f261"
-SRCREV_meta ?= "6ac2680ca4316fe111cddec37def7757843bbe86"
+SRCREV_machine ?= "f4ba3db6e599ed41d1c676f9086ad8b97fd55046"
+SRCREV_meta ?= "416a2862c3bac3ecb641bf14e14c1d2c9c23ed96"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.10.git;branch=${KBRANCH};name=machine \
            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 b136bf09503..cb13f4fbdca 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"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "65370fa249e282e4ce69cf927c01898b4c16f261"
-SRCREV_meta ?= "6ac2680ca4316fe111cddec37def7757843bbe86"
+SRCREV_machine ?= "f4ba3db6e599ed41d1c676f9086ad8b97fd55046"
+SRCREV_meta ?= "416a2862c3bac3ecb641bf14e14c1d2c9c23ed96"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_4.10.bb b/meta/recipes-kernel/linux/linux-yocto_4.10.bb
index 4107891f6e8..10b56cda77e 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"
 KBRANCH_qemux86-64 ?= "standard/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "4c652d50c67050422da4621cc6421ecb86b31c31"
-SRCREV_machine_qemuarm64 ?= "65370fa249e282e4ce69cf927c01898b4c16f261"
-SRCREV_machine_qemumips ?= "0a632fa7f9615ad1b2488a300846a7e925e6591a"
-SRCREV_machine_qemuppc ?= "65370fa249e282e4ce69cf927c01898b4c16f261"
-SRCREV_machine_qemux86 ?= "65370fa249e282e4ce69cf927c01898b4c16f261"
-SRCREV_machine_qemux86-64 ?= "65370fa249e282e4ce69cf927c01898b4c16f261"
-SRCREV_machine_qemumips64 ?= "75c22c1be83bf7894af78a36b3e3c5af08ce4d7b"
-SRCREV_machine ?= "65370fa249e282e4ce69cf927c01898b4c16f261"
-SRCREV_meta ?= "6ac2680ca4316fe111cddec37def7757843bbe86"
+SRCREV_machine_qemuarm ?= "97253eca8592c9cba7c7665277e1118b048b9639"
+SRCREV_machine_qemuarm64 ?= "f4ba3db6e599ed41d1c676f9086ad8b97fd55046"
+SRCREV_machine_qemumips ?= "52e935b59800868731e7620caf49cc257f1b9946"
+SRCREV_machine_qemuppc ?= "f4ba3db6e599ed41d1c676f9086ad8b97fd55046"
+SRCREV_machine_qemux86 ?= "f4ba3db6e599ed41d1c676f9086ad8b97fd55046"
+SRCREV_machine_qemux86-64 ?= "f4ba3db6e599ed41d1c676f9086ad8b97fd55046"
+SRCREV_machine_qemumips64 ?= "7b6d7feb4b0143d6f9146784f6072ffd171dd7ba"
+SRCREV_machine ?= "f4ba3db6e599ed41d1c676f9086ad8b97fd55046"
+SRCREV_meta ?= "416a2862c3bac3ecb641bf14e14c1d2c9c23ed96"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-4.10.git;name=machine;branch=${KBRANCH}; \
            git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-4.10;destsuffix=${KMETA}"