diff options
author | Jeremy Puhlman <jpuhlman@mvista.com> | 2020-03-19 17:21:56 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-22 10:48:43 +0000 |
commit | f6697e551e4f478ea7f22586545bc1c639fe44c2 (patch) | |
tree | 8c456f9fe6372cc249402801bddaa047b478163f /meta/recipes-devtools/qemu/qemu.inc | |
parent | 27ff81bfd880280607c79dce2f724c8bfafce02d (diff) | |
download | poky-f6697e551e4f478ea7f22586545bc1c639fe44c2.tar.gz |
qemu-system-native: disable options not included in extended tarball
* Add PACKAGECONFIG option for xkbcommon
qemu-keymap.c:16:10: fatal error: xkbcommon/xkbcommon.h: No such file or directory
* Add PACKAGECONFIG option and patch for libudev
commands-posix.c:53:10: fatal error: libudev.h: No such file or directory
* Add PACKAGECONFIG option for libxml2
util/osdep.c:136: undefined reference to `fcntl64'
- Without specifying libxml2, configure searches the system and pulls in the system
libxml2 if it is present. In the process it adds -L/usr/lib64 which causes the
system libc to be linked instead of the one from the extended tarball.
None of the above libraries appear to be included in the depends for any of the qemu
builds, so if they are getting linked in, its probably not intentionally.
(From OE-Core rev: 3f1fd15cf0df4a4b12d49ac795b1c9e02de61429)
Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu.inc')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 3ce14d9fa0..7cf436783d 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc | |||
@@ -33,6 +33,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ | |||
33 | file://CVE-2020-7039-1.patch \ | 33 | file://CVE-2020-7039-1.patch \ |
34 | file://CVE-2020-7039-2.patch \ | 34 | file://CVE-2020-7039-2.patch \ |
35 | file://CVE-2020-7039-3.patch \ | 35 | file://CVE-2020-7039-3.patch \ |
36 | file://0001-Add-enable-disable-udev.patch \ | ||
36 | " | 37 | " |
37 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" | 38 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" |
38 | 39 | ||
@@ -172,6 +173,9 @@ PACKAGECONFIG[spice] = "--enable-spice,--disable-spice,spice" | |||
172 | PACKAGECONFIG[usb-redir] = "--enable-usb-redir,--disable-usb-redir,usbredir" | 173 | PACKAGECONFIG[usb-redir] = "--enable-usb-redir,--disable-usb-redir,usbredir" |
173 | PACKAGECONFIG[snappy] = "--enable-snappy,--disable-snappy,snappy" | 174 | PACKAGECONFIG[snappy] = "--enable-snappy,--disable-snappy,snappy" |
174 | PACKAGECONFIG[glusterfs] = "--enable-glusterfs,--disable-glusterfs" | 175 | PACKAGECONFIG[glusterfs] = "--enable-glusterfs,--disable-glusterfs" |
176 | PACKAGECONFIG[xkbcommon] = "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon" | ||
177 | PACKAGECONFIG[libudev] = "--enable-libudev,--disable-libudev,eudev" | ||
178 | #PACKAGECONFIG[libxml2] = "--enable-libxml2,--disable-libxml2,libxml2" | ||
175 | 179 | ||
176 | INSANE_SKIP_${PN} = "arch" | 180 | INSANE_SKIP_${PN} = "arch" |
177 | 181 | ||