From: Chunrong Guo <chunrong.guo@nxp.com>
Date: Wed, 30 Aug 2017 09:28:20 +0000 (+0800)
Subject: qemu-qoriq: remove
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=1f1d3596cae5617c697a859dd81696426c17e0bc;p=meta-freescale.git

qemu-qoriq: remove

This pkg will not be supported anymore.

Signed-off-by: Chunrong Guo <B40290@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---

diff --git a/conf/machine/include/qoriq-base.inc b/conf/machine/include/qoriq-base.inc
index 2210cf52..14fe8ceb 100644
--- a/conf/machine/include/qoriq-base.inc
+++ b/conf/machine/include/qoriq-base.inc
@@ -6,7 +6,6 @@ PREFERRED_PROVIDER_openssl = "openssl-qoriq"
 PREFERRED_PROVIDER_u-boot ?= "u-boot-qoriq"
 PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-qoriq"
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-qoriq"
-PREFERRED_PROVIDER_qemu = "qemu-qoriq"
 PREFERRED_VERSION_testfloat = "2a"
 
 SOC_DEFAULT_IMAGE_FSTYPES = "tar.gz ext2.gz.u-boot ext2.gz"
diff --git a/recipes-devtools/qemu/qemu-qoriq/add-ptest-in-makefile.patch b/recipes-devtools/qemu/qemu-qoriq/add-ptest-in-makefile.patch
deleted file mode 100644
index a99f7209..00000000
--- a/recipes-devtools/qemu/qemu-qoriq/add-ptest-in-makefile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Upstream-Status: Pending
-
-Add subpackage -ptest which runs all unit test cases for qemu.
-
-Signed-off-by: Kai Kang <kai.kang@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
deleted file mode 100644
index f4b8e97e..00000000
--- a/recipes-devtools/qemu/qemu-qoriq/run-ptest
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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
deleted file mode 100644
index 87662e13..00000000
--- a/recipes-devtools/qemu/qemu-qoriq_git.bb
+++ /dev/null
@@ -1,84 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-require recipes-devtools/qemu/qemu.inc
-
-PROVIDES = "qemu"
-
-python() {
-    pkgs = d.getVar('PACKAGES', True).split()
-    for p in pkgs:
-        if 'qemu-qoriq' in p:
-            d.appendVar("RPROVIDES_%s" % p, p.replace('qemu-qoriq', 'qemu'))
-            d.appendVar("RCONFLICTS_%s" % p, p.replace('qemu-qoriq', 'qemu'))
-            d.appendVar("RREPLACES_%s" % p, p.replace('qemu-qoriq', 'qemu'))
-}
-
-DESCRIPTION = "This recipe requires poky's qemu.inc which includes the FSL \
-fixes of QorIQ ARM and QorIQ PPC targets. The recipe only works for FSL \
-QorIQ machines. The poky version should be used for native/nativesdk build."
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
-                    file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
-
-SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;nobranch=1"
-SRCREV = "ef54fffcee4324c9a32bf6e260c8141b4e6c542e"
-
-# add ptest patches
-SRC_URI_append = "\
-    file://add-ptest-in-makefile.patch \
-    file://run-ptest \
-"
-
-S = "${WORKDIR}/git"
-
-QEMU_TARGETS_qoriq-ppc = "ppc"
-QEMU_TARGETS_qoriq-arm = "arm"
-QEMU_TARGETS_qoriq_arm64 = "aarch64"
-QEMU_TARGETS_fsl-lsch2-32b = "arm"
-PPC_OECONF = '${SDL} --cross-prefix=${TARGET_PREFIX} --disable-werror --disable-vnc --disable-bluez --disable-curl'
-EXTRA_OECONF_e5500-64b = "--target-list=ppc64-softmmu ${PPC_OECONF}"
-EXTRA_OECONF_e6500-64b = "--target-list=ppc64-softmmu ${PPC_OECONF}"
-EXTRA_OECONF_e6500 = "--target-list=ppc64-softmmu ${PPC_OECONF}"
-EXTRA_OECONF_e5500 = "--target-list=ppc64-softmmu ${PPC_OECONF}"
-EXTRA_OECONF_e500v2 = "--target-list=ppc-softmmu ${PPC_OECONF}"
-EXTRA_OECONF_e500mc = "--target-list=ppc-softmmu ${PPC_OECONF}"
-PACKAGECONFIG_append = " aio libusb"
-
-DISABLE_STATIC = ""
-
-# Append build host pkg-config paths for native target since the host may provide sdl
-do_configure_prepend() {
-    export PKG_CONFIG=${STAGING_DIR_NATIVE}${bindir_native}/pkg-config
-}
-
-do_configure_append () {
-    if ! grep 'CONFIG_FDT=y' config-host.mak; then
-         echo "CONFIG_RDMA=y" >> config_host_mak
-    fi
-}
-
-# 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
-    # Prevent QA warnings about installed ${localstatedir}/run
-    if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi
-}
-
-do_install_ptest() {
-    cp -rL ${B}/tests ${D}${PTEST_PATH}
-    find ${D}${PTEST_PATH}/tests -type f -name "*.[Sshcod]" | xargs -i rm -rf {}
-
-    cp ${S}/tests/Makefile ${D}${PTEST_PATH}/tests
-}
-
-FILES_${PN} += "${datadir}/qemu/"
-INSANE_SKIP_${PN} += "dev-deps"
-
-# FIXME: Avoid WARNING due missing patch for native/nativesdk
-BBCLASSEXTEND = ""
-
-COMPATIBLE_MACHINE = "(qoriq)"