[meta-freescale] [meta-fsl-arm][PATCH 11/41] qemu-qoriq: upgrade to v2.4 plus fsl patches

[ting.liu at nxp.com]

From: Ting Liu <ting.liu at nxp.com>

Detailed commit log can be found at:
http://git.freescale.com/git/cgit.cgi/ppc/sdk/qemu.git/log/?h=sdk-v2.0.x

Signed-off-by: Ting Liu <ting.liu at nxp.com>
---
 .../qemu/qemu-qoriq/add-ptest-in-makefile.patch    | 29 +++++++++++++++++
 recipes-devtools/qemu/qemu-qoriq/run-ptest         |  8 +++++
 recipes-devtools/qemu/qemu-qoriq_git.bb            | 36 ++++++++++------------
 3 files changed, 54 insertions(+), 19 deletions(-)
 create mode 100644 recipes-devtools/qemu/qemu-qoriq/add-ptest-in-makefile.patch
 create mode 100644 recipes-devtools/qemu/qemu-qoriq/run-ptest

diff --git a/recipes-devtools/qemu/qemu-qoriq/add-ptest-in-makefile.patch b/recipes-devtools/qemu/qemu-qoriq/add-ptest-in-makefile.patch
new file mode 100644
index 0000000..a99f720
--- /dev/null
+++ b/recipes-devtools/qemu/qemu-qoriq/add-ptest-in-makefile.patch
@@ -0,0 +1,29 @@
+Upstream-Status: Pending
+
+Add subpackage -ptest which runs all unit test cases for qemu.
+
+Signed-off-by: Kai Kang <kai.kang at windriver.com>
+---
+ tests/Makefile |   10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/tests/Makefile b/tests/Makefile
+index 88f7105..3f40b4b 100644
+--- a/tests/Makefile
++++ b/tests/Makefile
+@@ -405,3 +405,12 @@ all: $(QEMU_IOTESTS_HELPERS-y)
+ 
+ -include $(wildcard tests/*.d)
+ -include $(wildcard tests/libqos/*.d)
++
++buildtest-TESTS: $(check-unit-y)
++
++runtest-TESTS:
++	for f in $(check-unit-y); do \
++		nf=$$(echo $$f | sed 's/tests\//\.\//g'); \
++		$$nf; \
++	done
++
+--
+1.7.9.5
+
diff --git a/recipes-devtools/qemu/qemu-qoriq/run-ptest b/recipes-devtools/qemu/qemu-qoriq/run-ptest
new file mode 100644
index 0000000..f4b8e97
--- /dev/null
+++ b/recipes-devtools/qemu/qemu-qoriq/run-ptest
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+#This script is used to run qemu test suites
+ptestdir=$(pwd)
+cd tests
+
+export SRC_PATH=$ptestdir
+make -k runtest-TESTS | sed '/: OK/ s/^/PASS: /g'
diff --git a/recipes-devtools/qemu/qemu-qoriq_git.bb b/recipes-devtools/qemu/qemu-qoriq_git.bb
index ddabd00..e59aa36 100644
--- a/recipes-devtools/qemu/qemu-qoriq_git.bb
+++ b/recipes-devtools/qemu/qemu-qoriq_git.bb
@@ -1,3 +1,5 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
 require recipes-devtools/qemu/qemu.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
@@ -14,32 +16,27 @@ python() {
             d.appendVar("RREPLACES_%s" % p, p.replace('qemu-qoriq', 'qemu'))
 }
 
-# This means QEMU v2.2.0 with FSL specific patches applied
-PV = "2.2.0+${SRCPV}"
-
-# NOTE: this recipe requires poky's qemu.inc which assumes version 2.3
-# where glx enable config option changed to --enable-opengl. For now we
-# restore it, but we should remove the following lines when upgrading
-# to qemu 2.3:
-PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,mesa"
-
-# remove not supported PACKAGECONFIG by this v2.2.0 based recipe
+# remove not supported PACKAGECONFIG by this recipe
 PACKAGECONFIG[gcrypt] = ""
-PACKAGECONFIG[gnutls] = ""
 PACKAGECONFIG[nettle] = ""
 PACKAGECONFIG[nss] = ""
 
-SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;branch=master"
-SRCREV = "00ac004143e9fe46944a1885b04268fcd3a95a3a"
+SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;branch=sdk-v2.0.x"
+SRCREV = "4b846e9b2b15660abace52dd27a406af08c4212d"
 
-S = "${WORKDIR}/git"
+# add ptest patches
+SRC_URI_append = "\
+    file://add-ptest-in-makefile.patch \
+    file://run-ptest \
+"
 
-QEMU_TARGETS = "arm"
-DISABLE_STATIC = ""
+S = "${WORKDIR}/git"
 
-inherit pkgconfig
+QEMU_TARGETS_qoriq-arm = "arm"
+QEMU_TARGETS_qoriq_arm64 = "aarch64"
+PACKAGECONFIG_append = " aio libusb"
 
-do_compile_ptest_base[noexec] = "1"
+DISABLE_STATIC = ""
 
 # Append build host pkg-config paths for native target since the host may provide sdl
 do_configure_prepend() {
@@ -63,7 +60,8 @@ do_install_append() {
     if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi
 }
 
-FILES_${PN} += "/usr/share/qemu/"
+FILES_${PN} += "${datadir}/qemu/"
+INSANE_SKIP_${PN} += "dev-deps"
 
 # FIXME: Avoid WARNING due missing patch for native/nativesdk
 BBCLASSEXTEND = ""
-- 
1.9.2