summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-14 15:27:42 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-15 18:21:47 +0100
commitf4ff3d3f8ae3e218f410ea1e3f6ed6f4a5b4baa8 (patch)
treef7fcd439eea15e7a350d9a4f34d6e7b6993016f8
parent57bdeec4cf1fbba79325b2c02afaac061a8190a9 (diff)
downloadpoky-f4ff3d3f8ae3e218f410ea1e3f6ed6f4a5b4baa8.tar.gz
qemu: Move dtc(fdt) configuration to PACKAGECONFIG
Converting this dependency to become a PACKAGECONFIG makes sense. (From OE-Core rev: 15d7dc8df4b508acfeac43a8d0f9e15889ec3e7d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 57907ae5c8..ed39be2432 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -1,7 +1,7 @@
1SUMMARY = "Fast open source processor emulator" 1SUMMARY = "Fast open source processor emulator"
2HOMEPAGE = "http://qemu.org" 2HOMEPAGE = "http://qemu.org"
3LICENSE = "GPLv2 & LGPLv2.1" 3LICENSE = "GPLv2 & LGPLv2.1"
4DEPENDS = "glib-2.0 zlib alsa-lib pixman dtc libsdl \ 4DEPENDS = "glib-2.0 zlib alsa-lib pixman libsdl \
5 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}" 5 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11', '', d)}"
6DEPENDS_class-native = "zlib-native alsa-lib-native glib-2.0-native pixman-native dtc-native" 6DEPENDS_class-native = "zlib-native alsa-lib-native glib-2.0-native pixman-native dtc-native"
7DEPENDS_class-nativesdk = "nativesdk-zlib nativesdk-libsdl nativesdk-glib-2.0 nativesdk-pixman nativesdk-dtc" 7DEPENDS_class-nativesdk = "nativesdk-zlib nativesdk-libsdl nativesdk-glib-2.0 nativesdk-pixman nativesdk-dtc"
@@ -83,7 +83,7 @@ do_install_append() {
83} 83}
84# END of qemu-mips workaround 84# END of qemu-mips workaround
85 85
86PACKAGECONFIG ??= "" 86PACKAGECONFIG ??= "fdt"
87PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr,--disable-virtfs,libcap attr," 87PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr,--disable-virtfs,libcap attr,"
88PACKAGECONFIG[aio] = "--enable-linux-aio,--disable-linux-aio,libaio," 88PACKAGECONFIG[aio] = "--enable-linux-aio,--disable-linux-aio,libaio,"
89PACKAGECONFIG[xfs] = "--enable-xfsctl,--disable-xfsctl,xfsprogs," 89PACKAGECONFIG[xfs] = "--enable-xfsctl,--disable-xfsctl,xfsprogs,"
@@ -103,6 +103,7 @@ PACKAGECONFIG[libcap-ng] = "--enable-cap-ng,--disable-cap-ng,libcap-ng,"
103PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl," 103PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl,"
104PACKAGECONFIG[ssh2] = "--enable-libssh2,--disable-libssh2,libssh2," 104PACKAGECONFIG[ssh2] = "--enable-libssh2,--disable-libssh2,libssh2,"
105PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb1" 105PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb1"
106PACKAGECONFIG[fdt] = "--enable-fdt,--disable-fdt,dtc"
106 107
107# Qemu target will not build in world build for ARM or Mips 108# Qemu target will not build in world build for ARM or Mips
108BROKEN_qemuarm = "1" 109BROKEN_qemuarm = "1"