[oe-commits] Cristian Iorga : qemu: upgrade to latest git

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: db5eb35604d72a1da59dd71d1aca0ace9f653f92
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=db5eb35604d72a1da59dd71d1aca0ace9f653f92

Author: Cristian Iorga <cristian.iorga at intel.com>
Date:   Fri Jul  3 19:20:12 2015 +0300

qemu: upgrade to latest git

Signed-off-by: Cristian Iorga <cristian.iorga at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-devtools/qemu/qemu.inc      |  1 -
 meta/recipes-devtools/qemu/qemu_2.3.0.bb |  2 ++
 meta/recipes-devtools/qemu/qemu_git.bb   | 16 +++++++++++++---
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index d794af9..7f21c15 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -15,7 +15,6 @@ QEMU_TARGETS ?= "arm aarch64 i386 mips mipsel mips64 mips64el ppc sh4 x86_64"
 
 SRC_URI = "\
     file://powerpc_rom.bin \
-    file://larger_default_ram_size.patch \
     file://disable-grabs.patch \
     file://exclude-some-arm-EABI-obsolete-syscalls.patch \
     file://wacom.patch \
diff --git a/meta/recipes-devtools/qemu/qemu_2.3.0.bb b/meta/recipes-devtools/qemu/qemu_2.3.0.bb
index cae0ad1..db70598 100644
--- a/meta/recipes-devtools/qemu/qemu_2.3.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_2.3.0.bb
@@ -24,6 +24,8 @@ SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2"
 SRC_URI[md5sum] = "2fab3ea4460de9b57192e5b8b311f221"
 SRC_URI[sha256sum] = "b6bab7f763d5be73e7cb5ee7d4c8365b7a8df2972c52fa5ded18893bd8281588"
 
+DEFAULT_PREFERENCE = "-1"
+
 COMPATIBLE_HOST_class-target_mips64 = "null"
 
 do_install_append() {
diff --git a/meta/recipes-devtools/qemu/qemu_git.bb b/meta/recipes-devtools/qemu/qemu_git.bb
index a30932a..8a0bd0f 100644
--- a/meta/recipes-devtools/qemu/qemu_git.bb
+++ b/meta/recipes-devtools/qemu/qemu_git.bb
@@ -1,15 +1,25 @@
 require qemu.inc
 
-SRCREV = "04024dea2674861fcf13582a77b58130c67fccd8"
+SRCREV = "1452673888f6d7f0454276d049846c9bec659233"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
                     file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
 
-PV = "1.3.0+git${SRCPV}"
+
+SRC_URI += "file://configure-fix-Darwin-target-detection.patch \
+            file://qemu-enlarge-env-entry-size.patch \
+            file://Qemu-Arm-versatilepb-Add-memory-size-checking.patch \
+           "
+PV = "2.3.0+git${SRCPV}"
 
 SRC_URI_prepend = "git://git.qemu.org/qemu.git"
 S = "${WORKDIR}/git"
 
-DEFAULT_PREFERENCE = "-1"
+
 
 COMPATIBLE_HOST_class-target_mips64 = "null"
+
+do_install_append() {
+    # Prevent QA warnings about installed ${localstatedir}/run
+    if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi
+}