From: Bruce Ashfield Date: Sun, 30 Mar 2014 19:14:46 +0000 (-0400) Subject: linux-yocto/3.10: fix qemuarm build failure X-Git-Tag: rev_ivi_2015_02_04~8500 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c03406edb92ba054e96b3de3ec4a63fc955e5983;p=scm%2Fbb%2Ftizen-distro.git 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 Signed-off-by: Richard Purdie --- 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" 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"