diff options
| author | Riku Voipio <riku.voipio@linaro.org> | 2013-06-11 11:03:39 +0300 |
|---|---|---|
| committer | Riku Voipio <riku.voipio@linaro.org> | 2013-06-11 11:03:39 +0300 |
| commit | 0f6e69504c6e1936cff4a39747ec01abd748babc (patch) | |
| tree | 855e54f1d867507d9761ed899a7633526f032abe /meta-aarch64 | |
| parent | d7d404916778da461579457ca53e720b72491809 (diff) | |
qemu: workaround qemu-native build
there is no TCG support for aarch64 so use another arch for now if
building qemu-native
Diffstat (limited to 'meta-aarch64')
| -rw-r--r-- | meta-aarch64/recipes-devtools/qemu/qemu.inc | 20 | ||||
| -rw-r--r-- | meta-aarch64/recipes-devtools/qemu/qemu_git.bb | 1 |
2 files changed, 1 insertions, 20 deletions
diff --git a/meta-aarch64/recipes-devtools/qemu/qemu.inc b/meta-aarch64/recipes-devtools/qemu/qemu.inc index a68d5080..d75d45b2 100644 --- a/meta-aarch64/recipes-devtools/qemu/qemu.inc +++ b/meta-aarch64/recipes-devtools/qemu/qemu.inc @@ -38,28 +38,8 @@ EXTRA_OECONF_class-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disa --disable-curl \ " -do_configure_prepend_class-native() { - # Undo the -lX11 added by linker-flags.patch, don't assume that host has libX11 installed - sed -i 's/-lX11//g' Makefile.target -} - -do_configure_prepend_class-nativesdk() { - if [ "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" = "" ] ; then - # Undo the -lX11 added by linker-flags.patch - sed -i 's/-lX11//g' Makefile.target - fi -} - do_configure() { - # Handle distros such as CentOS 5 32-bit that do not have kvm support - KVMOPTS="--disable-kvm" - if [ "${PN}" != "qemu-native" -a "${PN}" != "nativesdk-qemu" ] \ - || [ -f /usr/include/linux/kvm.h ] ; then - KVMOPTS="--enable-kvm" - fi - ${S}/configure --prefix=${prefix} --sysconfdir=${sysconfdir} --libexecdir=${libexecdir} --disable-strip ${EXTRA_OECONF} $KVMOPTS - test ! -e ${S}/target-i386/beginend_funcs.sh || chmod a+x ${S}/target-i386/beginend_funcs.sh } do_install () { diff --git a/meta-aarch64/recipes-devtools/qemu/qemu_git.bb b/meta-aarch64/recipes-devtools/qemu/qemu_git.bb index d29ef130..99451081 100644 --- a/meta-aarch64/recipes-devtools/qemu/qemu_git.bb +++ b/meta-aarch64/recipes-devtools/qemu/qemu_git.bb @@ -8,6 +8,7 @@ PR = "r0" QEMU_TARGETS_aarch64 = "" EXTRA_OECONF_aarch64 += "--enable-tcg-interpreter --enable-kvm --enable-fdt --target-list=aarch64-softmmu" +EXTRA_OECONF_class-native = "--target-list=arm-linux-user" SRC_URI = "git://git.linaro.org/people/pmaydell/qemu-aarch64.git;branch=kvm-aarch64-wip" S = "${WORKDIR}/git" |