diff options
author | Cristian Iorga <cristian.iorga@intel.com> | 2015-07-16 20:30:06 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-16 20:40:05 +0100 |
commit | 46720f0e7a119aa8792a9615ecbc237cb0bea769 (patch) | |
tree | 45be3846c41f215829650791ef65fe1239c1739e /meta/recipes-devtools/qemu/qemu.inc | |
parent | 56542b84512047debd7b43d0f0b72987313f97ba (diff) | |
download | poky-46720f0e7a119aa8792a9615ecbc237cb0bea769.tar.gz |
qemu: upgrade to 2.4.0-rc0
- Get rid of direct use of gnutls APIs in quorum
blockdrv in favour of using the crypto APIs.
- Convert VNC websockets to use crypto APIs.
- quorum and vnc-ws packageconfig options no
longer exist, removed.
- All previous CVE are now included.
- larger_default_ram_size.patch patch removed,
no longer necessary.
(From OE-Core rev: ff384c084678dab33bbd7eb82ece21a2baa13dfb)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.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 | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index d794af9462..eba7d3dae5 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc | |||
@@ -15,7 +15,6 @@ QEMU_TARGETS ?= "arm aarch64 i386 mips mipsel mips64 mips64el ppc sh4 x86_64" | |||
15 | 15 | ||
16 | SRC_URI = "\ | 16 | SRC_URI = "\ |
17 | file://powerpc_rom.bin \ | 17 | file://powerpc_rom.bin \ |
18 | file://larger_default_ram_size.patch \ | ||
19 | file://disable-grabs.patch \ | 18 | file://disable-grabs.patch \ |
20 | file://exclude-some-arm-EABI-obsolete-syscalls.patch \ | 19 | file://exclude-some-arm-EABI-obsolete-syscalls.patch \ |
21 | file://wacom.patch \ | 20 | file://wacom.patch \ |
@@ -89,9 +88,7 @@ PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr,--disable-virtfs,libcap a | |||
89 | PACKAGECONFIG[aio] = "--enable-linux-aio,--disable-linux-aio,libaio," | 88 | PACKAGECONFIG[aio] = "--enable-linux-aio,--disable-linux-aio,libaio," |
90 | PACKAGECONFIG[xfs] = "--enable-xfsctl,--disable-xfsctl,xfsprogs," | 89 | PACKAGECONFIG[xfs] = "--enable-xfsctl,--disable-xfsctl,xfsprogs," |
91 | PACKAGECONFIG[xen] = "--enable-xen,--disable-xen,xen,xen-libxenstore xen-libxenctrl xen-libxenguest" | 90 | PACKAGECONFIG[xen] = "--enable-xen,--disable-xen,xen,xen-libxenstore xen-libxenctrl xen-libxenguest" |
92 | PACKAGECONFIG[quorum] = "--enable-quorum, --disable-quorum, gnutls," | ||
93 | PACKAGECONFIG[vnc-tls] = "--enable-vnc --enable-vnc-tls,--disable-vnc-tls, gnutls," | 91 | PACKAGECONFIG[vnc-tls] = "--enable-vnc --enable-vnc-tls,--disable-vnc-tls, gnutls," |
94 | PACKAGECONFIG[vnc-ws] = "--enable-vnc --enable-vnc-ws,--disable-vnc-ws, gnutls," | ||
95 | PACKAGECONFIG[vnc-sasl] = "--enable-vnc --enable-vnc-sasl,--disable-vnc-sasl,cyrus-sasl," | 92 | PACKAGECONFIG[vnc-sasl] = "--enable-vnc --enable-vnc-sasl,--disable-vnc-sasl,cyrus-sasl," |
96 | PACKAGECONFIG[vnc-jpeg] = "--enable-vnc --enable-vnc-jpeg,--disable-vnc-jpeg,jpeg," | 93 | PACKAGECONFIG[vnc-jpeg] = "--enable-vnc --enable-vnc-jpeg,--disable-vnc-jpeg,jpeg," |
97 | PACKAGECONFIG[vnc-png] = "--enable-vnc --enable-vnc-png,--disable-vnc-png,libpng," | 94 | PACKAGECONFIG[vnc-png] = "--enable-vnc --enable-vnc-png,--disable-vnc-png,libpng," |