summaryrefslogtreecommitdiffstats
path: root/recipes-devtools/qemu
diff options
context:
space:
mode:
authorZhenhua Luo <zhenhua.luo@freescale.com>2015-08-17 18:12:52 +0800
committerOtavio Salvador <otavio@ossystems.com.br>2016-04-19 15:03:15 -0300
commitd869d9080dfd9a44fd84b3a57acee08666ab45b8 (patch)
treed67416d63b2f5dd6635538a2a983cab780f3b200 /recipes-devtools/qemu
parent16a50412b0adcbd51fce55006fe15155181be06b (diff)
downloadmeta-freescale-d869d9080dfd9a44fd84b3a57acee08666ab45b8.tar.gz
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 <zhenhua.luo@freescale.com>
Diffstat (limited to 'recipes-devtools/qemu')
-rw-r--r--recipes-devtools/qemu/qemu-fsl_git.bb49
-rw-r--r--recipes-devtools/qemu/qemu-qoriq_git.bb (renamed from recipes-devtools/qemu/qemu_fslgit.bb)30
2 files changed, 20 insertions, 59 deletions
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 @@
1require recipes-devtools/qemu/qemu.inc
2
3LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
4 file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
5
6# This means QEMU v2.2.0 with FSL specific patches applied
7PV = "2.2.0+${SRCPV}"
8
9# NOTE: this recipe requires poky's qemu.inc which assumes version 2.3
10# where glx enable config option changed to --enable-opengl. For now we
11# restore it, but we should remove the following lines when upgrading
12# to qemu 2.3:
13PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,mesa"
14
15SRC_URI = "git://git.freescale.com/ppc/sdk/qemu.git;branch=master"
16SRCREV = "00ac004143e9fe46944a1885b04268fcd3a95a3a"
17
18S = "${WORKDIR}/git"
19
20QEMU_TARGETS = "arm"
21
22inherit pkgconfig
23
24# Append build host pkg-config paths for native target since the host may provide sdl
25do_configure_prepend() {
26 export PKG_CONFIG=${STAGING_DIR_NATIVE}${bindir_native}/pkg-config
27}
28
29do_configure_append () {
30 if ! grep 'CONFIG_FDT=y' config-host.mak; then
31 echo "CONFIG_RDMA=y" >> config_host_mak
32 fi
33}
34
35# gets around qemu.inc trying to install powerpc_rom.bin
36do_install_prepend() {
37 touch ${WORKDIR}/powerpc_rom.bin
38}
39
40do_install_append() {
41 rm ${WORKDIR}/powerpc_rom.bin
42 # Prevent QA warnings about installed ${localstatedir}/run
43 if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi
44}
45
46FILES_${PN} += "/usr/share/qemu/"
47
48# FIXME: Avoid WARNING due missing patch for native/nativesdk
49BBCLASSEXTEND = ""
diff --git a/recipes-devtools/qemu/qemu_fslgit.bb b/recipes-devtools/qemu/qemu-qoriq_git.bb
index f977a379..3c613170 100644
--- a/recipes-devtools/qemu/qemu_fslgit.bb
+++ b/recipes-devtools/qemu/qemu-qoriq_git.bb
@@ -1,12 +1,17 @@
1require recipes-devtools/qemu/qemu.inc 1require recipes-devtools/qemu/qemu.inc
2 2
3DESCRIPTION = "This recipe requires poky's qemu.inc which includes the FSL \
4fixes of QorIQ ARM and QorIQ PPC targets, the recipe assumes that glx enable \
5config option is changed to --enable-opengl. The recipe only works for FSL \
6QorIQ machines. The poky version should be used for native/nativesdk build."
7
3LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ 8LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
4 file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" 9 file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
5 10
6# This means QEMU v2.2.0 with FSL specific patches applied 11# This means QEMU v2.2.0 with FSL specific patches applied
7PV = "2.2.0+fsl" 12PV = "2.2.0+${SRCPV}"
8 13
9# NOTE: this recipe requires poky's qemu.inc which assumes version 2.3 14# FIXME: this recipe requires poky's qemu.inc which assumes version 2.3
10# where glx enable config option changed to --enable-opengl. For now we 15# where glx enable config option changed to --enable-opengl. For now we
11# restore it, but we should remove the following lines when upgrading 16# restore it, but we should remove the following lines when upgrading
12# to qemu 2.3: 17# to qemu 2.3:
@@ -17,7 +22,8 @@ SRCREV = "00ac004143e9fe46944a1885b04268fcd3a95a3a"
17 22
18S = "${WORKDIR}/git" 23S = "${WORKDIR}/git"
19 24
20QEMU_TARGETS = "ppc" 25QEMU_TARGETS_qoriq-ppc = "ppc"
26QEMU_TARGETS_qoriq-arm = "arm"
21PPC_OECONF = '${SDL} --cross-prefix=${TARGET_PREFIX} --disable-werror --disable-vnc --disable-bluez --disable-curl --enable-libusb' 27PPC_OECONF = '${SDL} --cross-prefix=${TARGET_PREFIX} --disable-werror --disable-vnc --disable-bluez --disable-curl --enable-libusb'
22EXTRA_OECONF_e5500-64b = "--target-list=ppc64-softmmu ${PPC_OECONF}" 28EXTRA_OECONF_e5500-64b = "--target-list=ppc64-softmmu ${PPC_OECONF}"
23EXTRA_OECONF_e6500-64b = "--target-list=ppc64-softmmu ${PPC_OECONF}" 29EXTRA_OECONF_e6500-64b = "--target-list=ppc64-softmmu ${PPC_OECONF}"
@@ -26,12 +32,17 @@ EXTRA_OECONF_e5500 = "--target-list=ppc64-softmmu ${PPC_OECONF}"
26EXTRA_OECONF_e500v2 = "--target-list=ppc-softmmu ${PPC_OECONF}" 32EXTRA_OECONF_e500v2 = "--target-list=ppc-softmmu ${PPC_OECONF}"
27EXTRA_OECONF_e500mc = "--target-list=ppc-softmmu ${PPC_OECONF}" 33EXTRA_OECONF_e500mc = "--target-list=ppc-softmmu ${PPC_OECONF}"
28 34
35inherit pkgconfig
36
37# Append build host pkg-config paths for native target since the host may provide sdl
29do_configure_prepend() { 38do_configure_prepend() {
30 export PKG_CONFIG=${STAGING_DIR_NATIVE}${bindir_native}/pkg-config 39 export PKG_CONFIG=${STAGING_DIR_NATIVE}${bindir_native}/pkg-config
31} 40}
32 41
33do_configure_append () { 42do_configure_append () {
34 grep 'CONFIG_FDT=y' config-host.mak 43 if ! grep 'CONFIG_FDT=y' config-host.mak; then
44 echo "CONFIG_RDMA=y" >> config-host.mak
45 fi
35} 46}
36 47
37# gets around qemu.inc trying to install powerpc_rom.bin 48# gets around qemu.inc trying to install powerpc_rom.bin
@@ -45,11 +56,10 @@ do_install_append() {
45 if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi 56 if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi
46} 57}
47 58
59FILES_${PN} += "/usr/share/qemu/"
48INSANE_SKIP_${PN} += "dev-deps" 60INSANE_SKIP_${PN} += "dev-deps"
49 61
50# This is only meant to be build to run on the target 62# FIXME: Avoid WARNING due missing patch for native/nativesdk
51# for the given arch types listed, otherwise don't let 63BBCLASSEXTEND = ""
52# the package get built. COMPATIBLE_HOST would not work 64
53# because it was too generic 65COMPATIBLE_MACHINE = "(qoriq)"
54COMPATIBLE_MACHINE = "a^"
55COMPATIBLE_MACHINE_libc-glibc_qoriq-ppc = ".*"