summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2017-01-02 16:45:40 +1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-08 11:52:56 +0000
commit7065bb2148fe171c71aeac63ce247513216d17e4 (patch)
tree260d86de765972e142d7fdd564188b023faacdf3
parent5738f86f99e6067ddf9cccaa39d85bce464b4b94 (diff)
downloadpoky-7065bb2148fe171c71aeac63ce247513216d17e4.tar.gz
qemu: Improve and add PACKAGECONFIG options
Move the '--disable-bluez' and '--disable-iscsi' options to PACKAGECONFIG. And added the ${BLUEZ} dependency. Fix up the 'gcrypt' option to depend on 'libgcrypt' instead of gcrypt. This is the expected dependency as noted in the QEMU configure help. Handle the '--audio-drv-list' option inside the PACKAGECONFIG[alsa] args. The previous setting uses a ',' to denote the options for the arg however a space inside quotes is also acceptable and allows the arg to be used into the PACKAGECONFIG flag. (From OE-Core rev: 0aca9b735c6f9d7ffe2826e624942a563c501d1f) Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 2b82e8fd02..1857786917 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -6,7 +6,7 @@ RDEPENDS_${PN}_class-target += "bash"
6RDEPENDS_${PN}-ptest = "bash make" 6RDEPENDS_${PN}-ptest = "bash make"
7 7
8require qemu-targets.inc 8require qemu-targets.inc
9inherit autotools pkgconfig ptest 9inherit autotools pkgconfig ptest bluetooth
10BBCLASSEXTEND = "native nativesdk" 10BBCLASSEXTEND = "native nativesdk"
11 11
12# QEMU_TARGETS is overridable variable 12# QEMU_TARGETS is overridable variable
@@ -26,7 +26,7 @@ SRC_URI_append_class-native = "\
26 file://cpus.c-qemu_cpu_kick_thread_debugging.patch \ 26 file://cpus.c-qemu_cpu_kick_thread_debugging.patch \
27 " 27 "
28 28
29EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --disable-bluez --disable-libiscsi --with-system-pixman --extra-cflags='${CFLAGS}'" 29EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --with-system-pixman --extra-cflags='${CFLAGS}'"
30 30
31EXTRA_OECONF_class-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror" 31EXTRA_OECONF_class-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror"
32EXTRA_OECONF_append_class-native = " --python=${USRBINPATH}/python2" 32EXTRA_OECONF_append_class-native = " --python=${USRBINPATH}/python2"
@@ -120,17 +120,17 @@ PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses,"
120PACKAGECONFIG[gtk+] = "--enable-gtk --with-gtkabi=3.0 --enable-vte,--disable-gtk --disable-vte,gtk+3 vte" 120PACKAGECONFIG[gtk+] = "--enable-gtk --with-gtkabi=3.0 --enable-vte,--disable-gtk --disable-vte,gtk+3 vte"
121PACKAGECONFIG[libcap-ng] = "--enable-cap-ng,--disable-cap-ng,libcap-ng," 121PACKAGECONFIG[libcap-ng] = "--enable-cap-ng,--disable-cap-ng,libcap-ng,"
122PACKAGECONFIG[ssh2] = "--enable-libssh2,--disable-libssh2,libssh2," 122PACKAGECONFIG[ssh2] = "--enable-libssh2,--disable-libssh2,libssh2,"
123PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,gcrypt," 123PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt,"
124PACKAGECONFIG[nettle] = "--enable-nettle,--disable-nettle,nettle" 124PACKAGECONFIG[nettle] = "--enable-nettle,--disable-nettle,nettle"
125PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb1" 125PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb1"
126PACKAGECONFIG[fdt] = "--enable-fdt,--disable-fdt,dtc" 126PACKAGECONFIG[fdt] = "--enable-fdt,--disable-fdt,dtc"
127PACKAGECONFIG[alsa] = ",,alsa-lib" 127PACKAGECONFIG[alsa] = "--audio-drv-list='oss alsa',,alsa-lib"
128PACKAGECONFIG[glx] = "--enable-opengl,--disable-opengl,mesa" 128PACKAGECONFIG[glx] = "--enable-opengl,--disable-opengl,mesa"
129PACKAGECONFIG[lzo] = "--enable-lzo,--disable-lzo,lzo" 129PACKAGECONFIG[lzo] = "--enable-lzo,--disable-lzo,lzo"
130PACKAGECONFIG[numa] = "--enable-numa,--disable-numa,numactl" 130PACKAGECONFIG[numa] = "--enable-numa,--disable-numa,numactl"
131PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls" 131PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls"
132PACKAGECONFIG[bzip2] = "--enable-bzip2,--disable-bzip2,bzip2" 132PACKAGECONFIG[bzip2] = "--enable-bzip2,--disable-bzip2,bzip2"
133 133PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,${BLUEZ}"
134EXTRA_OECONF += "${@bb.utils.contains('PACKAGECONFIG', 'alsa', '--audio-drv-list=oss,alsa', '', d)}" 134PACKAGECONFIG[libiscsi] = "--enable-libiscsi,--disable-libiscsi"
135 135
136INSANE_SKIP_${PN} = "arch" 136INSANE_SKIP_${PN} = "arch"