summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-03-30 15:14:46 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-30 23:52:10 +0100
commit2116e326d9d7039aac4ec6c7ae5d2a2bedfb4a74 (patch)
tree538a80dd6f616438e4eee654568d47b5d0567d53
parent943a75a4f3b6877e4092dae14b59b7afef8cad3d (diff)
downloadopenembedded-core-contrib-2116e326d9d7039aac4ec6c7ae5d2a2bedfb4a74.tar.gz
openembedded-core-contrib-2116e326d9d7039aac4ec6c7ae5d2a2bedfb4a74.tar.bz2
openembedded-core-contrib-2116e326d9d7039aac4ec6c7ae5d2a2bedfb4a74.zip
linux-yocto/3.10: fix qemuarm build failure
The v3.10.24 merge created a merge conflict, which was not properly resolved. Fixing the merge conflict and fixing the build of qemu arm. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.10.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.10.bb b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
index 49dd13db68..10f4072021 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.10.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.10.bb
@@ -11,7 +11,7 @@ KBRANCH_qemux86 = "standard/common-pc/base"
KBRANCH_qemux86-64 = "standard/common-pc-64/base"
KBRANCH_qemumips64 = "standard/mti-malta64"
-SRCREV_machine_qemuarm ?= "0e99eabbe5b3bec853ace496f94612bc37800260"
+SRCREV_machine_qemuarm ?= "52a6807f42846c7d1442e11227722f59221fc64e"
SRCREV_machine_qemumips ?= "b6b20f49e9a169a0672b7cc2d7b93d6652ca7873"
SRCREV_machine_qemuppc ?= "d71b782615b802c78e1586494b94dd40531775c8"
SRCREV_machine_qemux86 ?= "c7739be126930006e3bfbdb2fb070a967abc5e09"