From d869d9080dfd9a44fd84b3a57acee08666ab45b8 Mon Sep 17 00:00:00 2001 From: Zhenhua Luo Date: Mon, 17 Aug 2015 18:12:52 +0800 Subject: qemu: unify the recipe for QorIQ ARM and QorIQ PPC * rename recipe to qemu-qoriq_git.bb to be product specific * add DESCRIPTION * conditionally define QEMU_TARGETS and EXTRA_OECONF * skip dev-deps check to fix build error * add COMPATIBLE_MACHINE Signed-off-by: Zhenhua Luo --- recipes-devtools/qemu/qemu-fsl_git.bb | 49 ------------------------- recipes-devtools/qemu/qemu-qoriq_git.bb | 65 +++++++++++++++++++++++++++++++++ recipes-devtools/qemu/qemu_fslgit.bb | 55 ---------------------------- 3 files changed, 65 insertions(+), 104 deletions(-) delete mode 100644 recipes-devtools/qemu/qemu-fsl_git.bb create mode 100644 recipes-devtools/qemu/qemu-qoriq_git.bb delete mode 100644 recipes-devtools/qemu/qemu_fslgit.bb (limited to 'recipes-devtools/qemu') diff --git a/recipes-devtools/qemu/qemu-fsl_git.bb b/recipes-devtools/qemu/qemu-fsl_git.bb deleted file mode 100644 index 94fb9b19..00000000 --- a/recipes-devtools/qemu/qemu-fsl_git.bb +++ /dev/null @@ -1,49 +0,0 @@ -require recipes-devtools/qemu/qemu.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ - file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" - -# 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" - -SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;branch=master" -SRCREV = "00ac004143e9fe46944a1885b04268fcd3a95a3a" - -S = "${WORKDIR}/git" - -QEMU_TARGETS = "arm" - -inherit pkgconfig - -# 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 -} - -FILES_${PN} += "/usr/share/qemu/" - -# FIXME: Avoid WARNING due missing patch for native/nativesdk -BBCLASSEXTEND = "" diff --git a/recipes-devtools/qemu/qemu-qoriq_git.bb b/recipes-devtools/qemu/qemu-qoriq_git.bb new file mode 100644 index 00000000..3c613170 --- /dev/null +++ b/recipes-devtools/qemu/qemu-qoriq_git.bb @@ -0,0 +1,65 @@ +require recipes-devtools/qemu/qemu.inc + +DESCRIPTION = "This recipe requires poky's qemu.inc which includes the FSL \ +fixes of QorIQ ARM and QorIQ PPC targets, the recipe assumes that glx enable \ +config option is changed to --enable-opengl. 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" + +# This means QEMU v2.2.0 with FSL specific patches applied +PV = "2.2.0+${SRCPV}" + +# FIXME: 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" + +SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;branch=master" +SRCREV = "00ac004143e9fe46944a1885b04268fcd3a95a3a" + +S = "${WORKDIR}/git" + +QEMU_TARGETS_qoriq-ppc = "ppc" +QEMU_TARGETS_qoriq-arm = "arm" +PPC_OECONF = '${SDL} --cross-prefix=${TARGET_PREFIX} --disable-werror --disable-vnc --disable-bluez --disable-curl --enable-libusb' +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}" + +inherit pkgconfig + +# 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 +} + +FILES_${PN} += "/usr/share/qemu/" +INSANE_SKIP_${PN} += "dev-deps" + +# FIXME: Avoid WARNING due missing patch for native/nativesdk +BBCLASSEXTEND = "" + +COMPATIBLE_MACHINE = "(qoriq)" diff --git a/recipes-devtools/qemu/qemu_fslgit.bb b/recipes-devtools/qemu/qemu_fslgit.bb deleted file mode 100644 index f977a379..00000000 --- a/recipes-devtools/qemu/qemu_fslgit.bb +++ /dev/null @@ -1,55 +0,0 @@ -require recipes-devtools/qemu/qemu.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ - file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" - -# This means QEMU v2.2.0 with FSL specific patches applied -PV = "2.2.0+fsl" - -# 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" - -SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;branch=master" -SRCREV = "00ac004143e9fe46944a1885b04268fcd3a95a3a" - -S = "${WORKDIR}/git" - -QEMU_TARGETS = "ppc" -PPC_OECONF = '${SDL} --cross-prefix=${TARGET_PREFIX} --disable-werror --disable-vnc --disable-bluez --disable-curl --enable-libusb' -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}" - -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 -} - -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