From: Ting Liu <[email protected]> Update revision to 00ac004 which released in fsl-sdk-v1.8.
Signed-off-by: Ting Liu <[email protected]> --- recipes-devtools/qemu/qemu-fsl_git.bb | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/recipes-devtools/qemu/qemu-fsl_git.bb b/recipes-devtools/qemu/qemu-fsl_git.bb index ca36c3d..94fb9b1 100644 --- a/recipes-devtools/qemu/qemu-fsl_git.bb +++ b/recipes-devtools/qemu/qemu-fsl_git.bb @@ -3,20 +3,17 @@ require recipes-devtools/qemu/qemu.inc LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" -# This means QEMU v1.7 with FSL specific patches applied -PV = "1.7+${SRCPV}" +# This means QEMU v2.2.0 with FSL specific patches applied +PV = "2.2.0+${SRCPV}" -# NOTE: these options are note available in qemu 1.7, but qemu.inc assumes -# version 2.0+ where they are available. For now we unset them, but we should -# remove the following lines when upgrading to qemu 2.0+: -PACKAGECONFIG[quorum] = "" -PACKAGECONFIG[lzo] = "" -PACKAGECONFIG[numa] = "" -PACKAGECONFIG[gtk+] = "" +# 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=sdk-v1.7.x \ -" -SRCREV = "6ac4597c059d35e2737b234747243e56d340f4db" +SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;branch=master" +SRCREV = "00ac004143e9fe46944a1885b04268fcd3a95a3a" S = "${WORKDIR}/git" @@ -26,23 +23,22 @@ 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 + 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 + 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 + touch ${WORKDIR}/powerpc_rom.bin } do_install_append() { - rm ${WORKDIR}/powerpc_rom.bin - + rm ${WORKDIR}/powerpc_rom.bin # Prevent QA warnings about installed ${localstatedir}/run if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi } -- 1.9.1 -- _______________________________________________ meta-freescale mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-freescale
