From: Matthew McClintock <msm@freescale.com>
Date: Wed, 25 Jul 2012 01:12:53 +0000 (+0000)
Subject: qemu: set preferred version for QEMU
X-Git-Tag: 2.1~534^2~417
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=a5cc2a34809def60fa44e2108840fb7abc8294f9;p=meta-freescale.git

qemu: set preferred version for QEMU

The preferred version needs to specify the QEMU
version for our qemu_git recipe (overridden by
the QEMU bbappends).  Without this patch we will
no pick up our qemu_git recipe.

Signed-off-by: Matthew McClintock <msm@freescale.com>
---

diff --git a/meta-fsl-ppc/conf/distro/fsl.conf b/meta-fsl-ppc/conf/distro/fsl.conf
index 0b0e17f7..b923415c 100644
--- a/meta-fsl-ppc/conf/distro/fsl.conf
+++ b/meta-fsl-ppc/conf/distro/fsl.conf
@@ -29,8 +29,6 @@ DISTRO_EXTRA_RDEPENDS_append_qemux86-64 = " ${POKYQEMUDEPS}"
 
 TCLIBCAPPEND = ""
 
-QEMU_TARGETS ?= "ppc"
-
 PREMIRRORS ?= "\
 bzr://.*/.*   http://downloads.yoctoproject.org/mirror/sources/ \n \
 cvs://.*/.*   http://downloads.yoctoproject.org/mirror/sources/ \n \
diff --git a/meta-fsl-ppc/conf/machine/e500mc.inc b/meta-fsl-ppc/conf/machine/e500mc.inc
index acb55c35..9f7ed31e 100644
--- a/meta-fsl-ppc/conf/machine/e500mc.inc
+++ b/meta-fsl-ppc/conf/machine/e500mc.inc
@@ -8,6 +8,7 @@ MACHINE_FEATURES_RRECOMMENDS = ""
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
 PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
+PREFERRED_VERSION_qemu = "1.0+fsl"
 
 KERNEL_IMAGETYPE ?= "uImage"
 # disable the images below for now
diff --git a/meta-fsl-ppc/conf/machine/e500v2.inc b/meta-fsl-ppc/conf/machine/e500v2.inc
index 2b837952..da515da0 100644
--- a/meta-fsl-ppc/conf/machine/e500v2.inc
+++ b/meta-fsl-ppc/conf/machine/e500v2.inc
@@ -6,6 +6,7 @@ MACHINE_EXTRA_RRECOMMENDS = ""
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
 PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
+PREFERRED_VERSION_qemu = "1.0+fsl"
 
 KERNEL_IMAGETYPE ?= "uImage"
 # disable the images below for now
diff --git a/meta-fsl-ppc/conf/machine/e5500-64b.inc b/meta-fsl-ppc/conf/machine/e5500-64b.inc
index 79639f66..709880ec 100644
--- a/meta-fsl-ppc/conf/machine/e5500-64b.inc
+++ b/meta-fsl-ppc/conf/machine/e5500-64b.inc
@@ -9,6 +9,7 @@ MACHINE_FEATURES_RRECOMMENDS = ""
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
 PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
+PREFERRED_VERSION_qemu = "1.0+fsl"
 
 KERNEL_IMAGETYPE ?= "uImage"
 # disable the images below for now
diff --git a/meta-fsl-ppc/conf/machine/e5500.inc b/meta-fsl-ppc/conf/machine/e5500.inc
index b89041b7..75c333a9 100644
--- a/meta-fsl-ppc/conf/machine/e5500.inc
+++ b/meta-fsl-ppc/conf/machine/e5500.inc
@@ -8,6 +8,7 @@ MACHINE_FEATURES_RRECOMMENDS = ""
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq-sdk"
 PREFERRED_VERSION_virtual/kernel ?= "3.0.34"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-qoriq-sdk-headers"
+PREFERRED_VERSION_qemu = "1.0+fsl"
 
 KERNEL_IMAGETYPE ?= "uImage"
 # disable the images below for now
diff --git a/meta-fsl-ppc/recipes-devtools/qemu/qemu_1.0.bb b/meta-fsl-ppc/recipes-devtools/qemu/qemu_1.0.bb
new file mode 100644
index 00000000..7a6e5450
--- /dev/null
+++ b/meta-fsl-ppc/recipes-devtools/qemu/qemu_1.0.bb
@@ -0,0 +1,39 @@
+require recipes-devtools/qemu/qemu.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
+                    file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
+
+# This means v1.0 with FSL specific patches applied
+PV = "1.0+fsl"
+
+DEPENDS += "dtc"
+
+SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git"
+SRCREV = "${AUTOREV}"
+
+S = "${WORKDIR}/git"
+
+QEMU_TARGETS = "ppc"
+PPC_OECONF = '${SDL} --disable-werror --disable-vnc --audio-drv-list="" --audio-card-list="" --disable-bluez --disable-curl'
+EXTRA_OECONF_powerpc = "--target-list=ppc-softmmu ${PPC_OECONF}"
+EXTRA_OECONF_powerpc64 = "--target-list=ppc64-softmmu ${PPC_OECONF}"
+
+do_configure_append () {
+	grep 'CONFIG_FDT=y' config-host.mak
+}
+
+# gets around qemu.inc trying to install powerpc_rom.bin
+do_install_prepend() {
+	touch ${WORKDIR}/powerpc_rom.bin
+}
+
+do_install_append() {
+	rm ${WORKDIR}/powerpc_rom.bin
+}
+
+# This is only meant to be build to run on the target
+# for the given arch types listed, otherwise don't let
+# the package get built. COMPATIBLE_HOST would not work
+# because it was too generic
+COMPATIBLE_MACHINE = "a^"
+COMPATIBLE_MACHINE_libc-glibc_fslmachine = ".*"