From 4f2f7fb26298be16d94d28b3533f118f83102294 Mon Sep 17 00:00:00 2001 From: Ting Liu Date: Mon, 20 Jun 2016 17:23:52 +0800 Subject: qemu: rename to qemu-qoriq Signed-off-by: Ting Liu --- conf/machine/include/qoriq.inc | 3 +- .../qemu/qemu-qoriq/add-ptest-in-makefile.patch | 29 +++++++++ recipes-devtools/qemu/qemu-qoriq/run-ptest | 8 +++ recipes-devtools/qemu/qemu-qoriq_git.bb | 74 ++++++++++++++++++++++ .../qemu/qemu/add-ptest-in-makefile.patch | 29 --------- recipes-devtools/qemu/qemu/run-ptest | 8 --- recipes-devtools/qemu/qemu_fslgit.bb | 64 ------------------- 7 files changed, 112 insertions(+), 103 deletions(-) create mode 100644 recipes-devtools/qemu/qemu-qoriq/add-ptest-in-makefile.patch create mode 100644 recipes-devtools/qemu/qemu-qoriq/run-ptest create mode 100644 recipes-devtools/qemu/qemu-qoriq_git.bb delete mode 100644 recipes-devtools/qemu/qemu/add-ptest-in-makefile.patch delete mode 100644 recipes-devtools/qemu/qemu/run-ptest delete mode 100644 recipes-devtools/qemu/qemu_fslgit.bb diff --git a/conf/machine/include/qoriq.inc b/conf/machine/include/qoriq.inc index 70cd56b..a32f1bc 100644 --- a/conf/machine/include/qoriq.inc +++ b/conf/machine/include/qoriq.inc @@ -7,8 +7,7 @@ PREFERRED_PROVIDER_cryptodev-linux = "cryptodev-qoriq-linux" PREFERRED_PROVIDER_cryptodev-module = "cryptodev-qoriq-module" PREFERRED_PROVIDER_cryptodev-tests = "cryptodev-qoriq-tests" PREFERRED_PROVIDER_openssl = "openssl-qoriq" - -PREFERRED_VERSION_qemu = "2.4.0+fsl" +PREFERRED_PROVIDER_qemu = "qemu-qoriq" MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" MACHINE_EXTRA_RRECOMMENDS += "udev-rules-qoriq kernel-modules" 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 +--- + 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 new file mode 100644 index 0000000..c70ed14 --- /dev/null +++ b/recipes-devtools/qemu/qemu-qoriq_git.bb @@ -0,0 +1,74 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +require recipes-devtools/qemu/qemu.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ + file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" + +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')) +} + +# remove not supported PACKAGECONFIG by this recipe +PACKAGECONFIG[gcrypt] = "" +PACKAGECONFIG[nettle] = "" +PACKAGECONFIG[nss] = "" + +SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;branch=sdk-v2.0.x" +SRCREV = "4b846e9b2b15660abace52dd27a406af08c4212d" + +# add ptest patches +SRC_URI_append = "\ + file://add-ptest-in-makefile.patch \ + file://run-ptest \ +" + +S = "${WORKDIR}/git" + +QEMU_TARGETS = "ppc" +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 = " libusb" + +DISABLE_STATIC = "" + +do_configure_prepend() { + export PKG_CONFIG=${STAGING_DIR_NATIVE}${bindir_native}/pkg-config +} + +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 + # Prevent QA warnings about installed ${localstatedir}/run + if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi +} + +FILES_${PN} += "${datadir}/qemu/" +INSANE_SKIP_${PN} += "dev-deps" + +# 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_qoriq-ppc = ".*" diff --git a/recipes-devtools/qemu/qemu/add-ptest-in-makefile.patch b/recipes-devtools/qemu/qemu/add-ptest-in-makefile.patch deleted file mode 100644 index a99f720..0000000 --- a/recipes-devtools/qemu/qemu/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 ---- - 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/run-ptest b/recipes-devtools/qemu/qemu/run-ptest deleted file mode 100644 index f4b8e97..0000000 --- a/recipes-devtools/qemu/qemu/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_fslgit.bb b/recipes-devtools/qemu/qemu_fslgit.bb deleted file mode 100644 index 08a31a9..0000000 --- a/recipes-devtools/qemu/qemu_fslgit.bb +++ /dev/null @@ -1,64 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -require recipes-devtools/qemu/qemu.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ - file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" - -# This means QEMU v2.4.0 with FSL specific patches applied -PV = "2.4.0+fsl" - -# remove not supported PACKAGECONFIG by this recipe -PACKAGECONFIG[gcrypt] = "" -PACKAGECONFIG[nettle] = "" -PACKAGECONFIG[nss] = "" - -SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;branch=sdk-v2.0.x" -SRCREV = "4b846e9b2b15660abace52dd27a406af08c4212d" - -# add ptest patches -SRC_URI_append = "\ - file://add-ptest-in-makefile.patch \ - file://run-ptest \ -" - -S = "${WORKDIR}/git" - -QEMU_TARGETS = "ppc" -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 = " libusb" - -do_configure_prepend() { - export PKG_CONFIG=${STAGING_DIR_NATIVE}${bindir_native}/pkg-config -} - -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 - # Prevent QA warnings about installed ${localstatedir}/run - if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi -} - -FILES_${PN} += "${datadir}/qemu/" -INSANE_SKIP_${PN} += "dev-deps" - -# 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_qoriq-ppc = ".*" -- cgit v1.2.3-54-g00ecf