summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/linux/linux-yocto_3.10.bb
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-03-30 19:14:46 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-30 22:53:00 (GMT)
commit4f80de9a568bcf0280c7e8b8f89ee6c2adfa477d (patch)
treeb43b2459a000f9e1295db6c4df038781b0aacd7a /meta/recipes-kernel/linux/linux-yocto_3.10.bb
parentb8584fe5c68c004c5e53e5f0a559886adac386ae (diff)
downloadpoky-4f80de9a568bcf0280c7e8b8f89ee6c2adfa477d.tar.gz
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. (From OE-Core rev: 2116e326d9d7039aac4ec6c7ae5d2a2bedfb4a74) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/linux/linux-yocto_3.10.bb')
-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 49dd13d..10f4072 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"
11KBRANCH_qemux86-64 = "standard/common-pc-64/base" 11KBRANCH_qemux86-64 = "standard/common-pc-64/base"
12KBRANCH_qemumips64 = "standard/mti-malta64" 12KBRANCH_qemumips64 = "standard/mti-malta64"
13 13
14SRCREV_machine_qemuarm ?= "0e99eabbe5b3bec853ace496f94612bc37800260" 14SRCREV_machine_qemuarm ?= "52a6807f42846c7d1442e11227722f59221fc64e"
15SRCREV_machine_qemumips ?= "b6b20f49e9a169a0672b7cc2d7b93d6652ca7873" 15SRCREV_machine_qemumips ?= "b6b20f49e9a169a0672b7cc2d7b93d6652ca7873"
16SRCREV_machine_qemuppc ?= "d71b782615b802c78e1586494b94dd40531775c8" 16SRCREV_machine_qemuppc ?= "d71b782615b802c78e1586494b94dd40531775c8"
17SRCREV_machine_qemux86 ?= "c7739be126930006e3bfbdb2fb070a967abc5e09" 17SRCREV_machine_qemux86 ?= "c7739be126930006e3bfbdb2fb070a967abc5e09"