diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-09-08 20:01:09 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-11 18:41:37 +0100 |
commit | d87987fc1a4e7f31fb5740568e5edb9a8d123992 (patch) | |
tree | 0d31c92214a6db2b070e18c4592040a00ce7386d /meta/recipes-devtools/qemu/qemu.inc | |
parent | 4a4d5f78a6962dda5f63e9891825c80a8a87bf66 (diff) | |
download | poky-d87987fc1a4e7f31fb5740568e5edb9a8d123992.tar.gz |
qemu: update 6.0.0 -> 6.1.0
Recipe changes:
qemu-plugin.h is installed by both qemu-native and qemu-system-native
qmp.py module is now provided in a module directory (no other files
from that directory are necessary to use it though)
additional host-specific info is stripeed from ptest tests/tcg/*.mak
Patches:
drop all backports
drop 0001-Add-enable-disable-udev.patch (change added upstream)
drop 0001-linux-user-Tag-vsx-with-ieee128-fpbits.patch
(issue fixed upstream)
drop 0004-qemu-disable-Valgrind.patch (valgrind detection moved
from configure to meson, and should be robust against host contamination)
rebase 0010-configure-Add-pkg-config-handling-for-libgcrypt.patch
(upstream moved libgcrypt handling from configure to meson, and using
pkg-config is now a one-liner adjustment)
rebase cross.patch
(From OE-Core rev: b2710d25e3d8d79a35dbd4332ffc5cc8053d5eb8)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.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 | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 4c94060222..54ffb85286 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc | |||
@@ -19,31 +19,17 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ | |||
19 | file://run-ptest \ | 19 | file://run-ptest \ |
20 | file://0001-qemu-Add-missing-wacom-HID-descriptor.patch \ | 20 | file://0001-qemu-Add-missing-wacom-HID-descriptor.patch \ |
21 | file://0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch \ | 21 | file://0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch \ |
22 | file://0004-qemu-disable-Valgrind.patch \ | ||
23 | file://0006-chardev-connect-socket-to-a-spawned-command.patch \ | 22 | file://0006-chardev-connect-socket-to-a-spawned-command.patch \ |
24 | file://0007-apic-fixup-fallthrough-to-PIC.patch \ | 23 | file://0007-apic-fixup-fallthrough-to-PIC.patch \ |
25 | file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ | 24 | file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ |
26 | file://0001-Add-enable-disable-udev.patch \ | ||
27 | file://0001-qemu-Do-not-include-file-if-not-exists.patch \ | 25 | file://0001-qemu-Do-not-include-file-if-not-exists.patch \ |
28 | file://mmap2.patch \ | 26 | file://mmap2.patch \ |
29 | file://determinism.patch \ | 27 | file://determinism.patch \ |
30 | file://0001-tests-meson.build-use-relative-path-to-refer-to-file.patch \ | 28 | file://0001-tests-meson.build-use-relative-path-to-refer-to-file.patch \ |
31 | file://0001-configure-fix-detection-of-gdbus-codegen.patch \ | ||
32 | file://0001-vhost-user-gpu-fix-memory-disclosure-in-virgl_cmd_ge.patch \ | ||
33 | file://0002-vhost-user-gpu-fix-resource-leak-in-vg_resource_crea.patch \ | ||
34 | file://0003-vhost-user-gpu-fix-memory-leak-in-vg_resource_attach.patch \ | ||
35 | file://0004-vhost-user-gpu-fix-memory-leak-while-calling-vg_reso.patch \ | ||
36 | file://0005-vhost-user-gpu-fix-memory-leak-in-virgl_cmd_resource.patch \ | ||
37 | file://0006-vhost-user-gpu-fix-memory-leak-in-virgl_resource_att.patch \ | ||
38 | file://0007-vhost-user-gpu-fix-OOB-write-in-virgl_cmd_get_capset.patch \ | ||
39 | file://0001-linux-user-Tag-vsx-with-ieee128-fpbits.patch \ | ||
40 | file://CVE-2021-3527-1.patch \ | ||
41 | file://CVE-2021-3527-2.patch \ | ||
42 | file://CVE-2021-3682.patch \ | ||
43 | " | 29 | " |
44 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" | 30 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" |
45 | 31 | ||
46 | SRC_URI[sha256sum] = "87bc1a471ca24b97e7005711066007d443423d19aacda3d442558ae032fa30b9" | 32 | SRC_URI[sha256sum] = "eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96" |
47 | 33 | ||
48 | SRC_URI:append:class-target = " file://cross.patch" | 34 | SRC_URI:append:class-target = " file://cross.patch" |
49 | SRC_URI:append:class-nativesdk = " file://cross.patch" | 35 | SRC_URI:append:class-nativesdk = " file://cross.patch" |
@@ -80,6 +66,9 @@ do_install_ptest() { | |||
80 | 66 | ||
81 | # Strip the paths from the QEMU variable, we can use PATH | 67 | # Strip the paths from the QEMU variable, we can use PATH |
82 | sed -i -e "s#^QEMU=.*/qemu-#QEMU=qemu-#g" ${D}${PTEST_PATH}/tests/tcg/*.mak | 68 | sed -i -e "s#^QEMU=.*/qemu-#QEMU=qemu-#g" ${D}${PTEST_PATH}/tests/tcg/*.mak |
69 | |||
70 | # Strip compiler flags as they break reproducibility | ||
71 | sed -i -e "s,CROSS_CC_GUEST=.*,CROSS_CC_GUEST=," ${D}${PTEST_PATH}/tests/tcg/*.mak | ||
83 | } | 72 | } |
84 | 73 | ||
85 | # QEMU_TARGETS is overridable variable | 74 | # QEMU_TARGETS is overridable variable |