diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-14 15:27:42 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-15 18:21:47 +0100 |
commit | f4ff3d3f8ae3e218f410ea1e3f6ed6f4a5b4baa8 (patch) | |
tree | f7fcd439eea15e7a350d9a4f34d6e7b6993016f8 | |
parent | 57bdeec4cf1fbba79325b2c02afaac061a8190a9 (diff) | |
download | poky-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.inc | 5 |
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 @@ | |||
1 | SUMMARY = "Fast open source processor emulator" | 1 | SUMMARY = "Fast open source processor emulator" |
2 | HOMEPAGE = "http://qemu.org" | 2 | HOMEPAGE = "http://qemu.org" |
3 | LICENSE = "GPLv2 & LGPLv2.1" | 3 | LICENSE = "GPLv2 & LGPLv2.1" |
4 | DEPENDS = "glib-2.0 zlib alsa-lib pixman dtc libsdl \ | 4 | DEPENDS = "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)}" |
6 | DEPENDS_class-native = "zlib-native alsa-lib-native glib-2.0-native pixman-native dtc-native" | 6 | DEPENDS_class-native = "zlib-native alsa-lib-native glib-2.0-native pixman-native dtc-native" |
7 | DEPENDS_class-nativesdk = "nativesdk-zlib nativesdk-libsdl nativesdk-glib-2.0 nativesdk-pixman nativesdk-dtc" | 7 | DEPENDS_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 | ||
86 | PACKAGECONFIG ??= "" | 86 | PACKAGECONFIG ??= "fdt" |
87 | PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr,--disable-virtfs,libcap attr," | 87 | PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr,--disable-virtfs,libcap attr," |
88 | PACKAGECONFIG[aio] = "--enable-linux-aio,--disable-linux-aio,libaio," | 88 | PACKAGECONFIG[aio] = "--enable-linux-aio,--disable-linux-aio,libaio," |
89 | PACKAGECONFIG[xfs] = "--enable-xfsctl,--disable-xfsctl,xfsprogs," | 89 | PACKAGECONFIG[xfs] = "--enable-xfsctl,--disable-xfsctl,xfsprogs," |
@@ -103,6 +103,7 @@ PACKAGECONFIG[libcap-ng] = "--enable-cap-ng,--disable-cap-ng,libcap-ng," | |||
103 | PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl," | 103 | PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl," |
104 | PACKAGECONFIG[ssh2] = "--enable-libssh2,--disable-libssh2,libssh2," | 104 | PACKAGECONFIG[ssh2] = "--enable-libssh2,--disable-libssh2,libssh2," |
105 | PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb1" | 105 | PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb1" |
106 | PACKAGECONFIG[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 |
108 | BROKEN_qemuarm = "1" | 109 | BROKEN_qemuarm = "1" |