summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/qemu/qemu.inc
diff options
context:
space:
mode:
authorJeremy Puhlman <jpuhlman@mvista.com>2020-03-19 17:21:56 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-21 22:39:36 +0000
commit3f1fd15cf0df4a4b12d49ac795b1c9e02de61429 (patch)
tree84ed901501fc052530962e7dee14ee94e3d76037 /meta/recipes-devtools/qemu/qemu.inc
parent25533a48a19e3e6eb9f96be51b1373830b5bb9f0 (diff)
downloadopenembedded-core-contrib-3f1fd15cf0df4a4b12d49ac795b1c9e02de61429.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. 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.inc4
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 \
file://CVE-2020-7039-1.patch \
file://CVE-2020-7039-2.patch \
file://CVE-2020-7039-3.patch \
+ file://0001-Add-enable-disable-udev.patch \
"
UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
@@ -172,6 +173,9 @@ PACKAGECONFIG[spice] = "--enable-spice,--disable-spice,spice"
PACKAGECONFIG[usb-redir] = "--enable-usb-redir,--disable-usb-redir,usbredir"
PACKAGECONFIG[snappy] = "--enable-snappy,--disable-snappy,snappy"
PACKAGECONFIG[glusterfs] = "--enable-glusterfs,--disable-glusterfs"
+PACKAGECONFIG[xkbcommon] = "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon"
+PACKAGECONFIG[libudev] = "--enable-libudev,--disable-libudev,eudev"
+#PACKAGECONFIG[libxml2] = "--enable-libxml2,--disable-libxml2,libxml2"
INSANE_SKIP_${PN} = "arch"