diff options
author | Alistair Francis <Alistair.Francis@wdc.com> | 2019-05-02 04:09:27 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-03 06:11:57 +0100 |
commit | 69085ccb296b35b0b0ed67c871f0f60106c27a48 (patch) | |
tree | 22db1a527ff808d887da933a78c12408393c9280 /meta/recipes-devtools/qemu/qemu.inc | |
parent | 3d19803cbd0869dd55dbc778dacf6f6397374457 (diff) | |
download | poky-69085ccb296b35b0b0ed67c871f0f60106c27a48.tar.gz |
qemu: Upgrade from 3.1.0 to 4.0.0
This commit upgrade QEMU to the latest 4.0.0 release.
- The COPYING.LIB file has changed SHA to:
"Synchronize the LGPL 2.1 with the version from gnu.org"
- SDL 1.2 has been removed, along with the --with-sdlabi command line
arg
- The backported patches have been removed
- Al the other patches have been refreshed and the numbering has been
updated
(From OE-Core rev: fed2a0f37a76732cd3de1b127d6902fb16dd4e05)
Signed-off-by: Alistair Francis <alistair.francis@wdc.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 | 41 |
1 files changed, 17 insertions, 24 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 3ec141452d..f7b41412ad 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc | |||
@@ -5,36 +5,27 @@ LICENSE = "GPLv2 & LGPLv2.1" | |||
5 | RDEPENDS_${PN}-ptest = "bash make" | 5 | RDEPENDS_${PN}-ptest = "bash make" |
6 | 6 | ||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ |
8 | file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913" | 8 | file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f" |
9 | 9 | ||
10 | SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ | 10 | SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ |
11 | file://powerpc_rom.bin \ | 11 | file://powerpc_rom.bin \ |
12 | file://0001-sdl.c-allow-user-to-disable-pointer-grabs.patch \ | ||
13 | file://0002-qemu-Add-missing-wacom-HID-descriptor.patch \ | ||
14 | file://0003-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch \ | ||
15 | file://run-ptest \ | 12 | file://run-ptest \ |
16 | file://0004-qemu-Add-addition-environment-space-to-boot-loader-q.patch \ | 13 | file://0001-qemu-Add-missing-wacom-HID-descriptor.patch \ |
17 | file://0005-qemu-disable-Valgrind.patch \ | 14 | file://0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch \ |
18 | file://0006-qemu-Limit-paths-searched-during-user-mode-emulation.patch \ | 15 | file://0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch \ |
19 | file://0007-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch \ | 16 | file://0004-qemu-disable-Valgrind.patch \ |
20 | file://0008-chardev-connect-socket-to-a-spawned-command.patch \ | 17 | file://0005-qemu-Limit-paths-searched-during-user-mode-emulation.patch \ |
21 | file://0009-apic-fixup-fallthrough-to-PIC.patch \ | 18 | file://0006-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch \ |
22 | file://0010-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ | 19 | file://0007-chardev-connect-socket-to-a-spawned-command.patch \ |
23 | file://0011-Revert-linux-user-fix-mmap-munmap-mprotect-mremap-sh.patch \ | 20 | file://0008-apic-fixup-fallthrough-to-PIC.patch \ |
24 | file://0001-Add-a-missing-X11-include.patch \ | 21 | file://0009-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ |
25 | file://0001-egl-headless-add-egl_create_context.patch \ | 22 | file://0010-Revert-linux-user-fix-mmap-munmap-mprotect-mremap-sh.patch \ |
26 | file://0014-fix-CVE-2018-16872.patch \ | 23 | file://0013-Revert-target-arm-Use-vector-operations-for-saturati.patch \ |
27 | file://0015-fix-CVE-2018-20124.patch \ | ||
28 | file://0016-fix-CVE-2018-20125.patch \ | ||
29 | file://0017-fix-CVE-2018-20126.patch \ | ||
30 | file://0018-fix-CVE-2018-20191.patch \ | ||
31 | file://0019-fix-CVE-2018-20216.patch \ | ||
32 | file://CVE-2019-3812.patch \ | ||
33 | " | 24 | " |
34 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" | 25 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" |
35 | 26 | ||
36 | SRC_URI[md5sum] = "fb687ce0b02d3bf4327e36d3b99427a8" | 27 | SRC_URI[md5sum] = "0afeca336fd57ae3d3086ec07f59d708" |
37 | SRC_URI[sha256sum] = "6a0508df079a0a33c2487ca936a56c12122f105b8a96a44374704bef6c69abfc" | 28 | SRC_URI[sha256sum] = "13a93dfe75b86734326f8d5b475fde82ec692d5b5a338b4262aeeb6b0fa4e469" |
38 | 29 | ||
39 | COMPATIBLE_HOST_mipsarchn32 = "null" | 30 | COMPATIBLE_HOST_mipsarchn32 = "null" |
40 | COMPATIBLE_HOST_mipsarchn64 = "null" | 31 | COMPATIBLE_HOST_mipsarchn64 = "null" |
@@ -133,7 +124,7 @@ make_qemu_wrapper() { | |||
133 | PACKAGECONFIG_remove_darwin = "kvm virglrenderer glx gtk+" | 124 | PACKAGECONFIG_remove_darwin = "kvm virglrenderer glx gtk+" |
134 | PACKAGECONFIG_remove_mingw32 = "kvm virglrenderer glx gtk+" | 125 | PACKAGECONFIG_remove_mingw32 = "kvm virglrenderer glx gtk+" |
135 | 126 | ||
136 | PACKAGECONFIG[sdl] = "--enable-sdl --with-sdlabi=2.0,--disable-sdl,libsdl2" | 127 | PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl2" |
137 | PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr,--disable-virtfs,libcap attr," | 128 | PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr,--disable-virtfs,libcap attr," |
138 | PACKAGECONFIG[aio] = "--enable-linux-aio,--disable-linux-aio,libaio," | 129 | PACKAGECONFIG[aio] = "--enable-linux-aio,--disable-linux-aio,libaio," |
139 | PACKAGECONFIG[xfs] = "--enable-xfsctl,--disable-xfsctl,xfsprogs," | 130 | PACKAGECONFIG[xfs] = "--enable-xfsctl,--disable-xfsctl,xfsprogs," |
@@ -169,3 +160,5 @@ PACKAGECONFIG[usb-redir] = "--enable-usb-redir,--disable-usb-redir,usbredir" | |||
169 | PACKAGECONFIG[snappy] = "--enable-snappy,--disable-snappy,snappy" | 160 | PACKAGECONFIG[snappy] = "--enable-snappy,--disable-snappy,snappy" |
170 | 161 | ||
171 | INSANE_SKIP_${PN} = "arch" | 162 | INSANE_SKIP_${PN} = "arch" |
163 | |||
164 | FILES_${PN} += "${datadir}/icons" | ||