diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-15 15:57:03 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-16 08:29:59 +0100 |
commit | d9aa32dbf9145d25565a17ac39b186e332ed9a12 (patch) | |
tree | 5d1c158c2e9c06265965641f638372a1e63c5135 /meta/recipes-devtools/qemu/qemu.inc | |
parent | a9e49336dcddf8b2a43116e7850c3e731786fb86 (diff) | |
download | poky-d9aa32dbf9145d25565a17ac39b186e332ed9a12.tar.gz |
qemu: Upgrade 5.2.0 -> 6.0.0
Building without PIE support seems broken upstream, enable it by default
to match the configuration others evidently use.
Tweak git submodule option to match upstream.
Drop backported/merged patches, refresh others.
(From OE-Core rev: ede1b86e663f1cafccc8aa8c35fa13ebd3f55d11)
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 | 35 |
1 files changed, 2 insertions, 33 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 74c53c6309..0cbd66301e 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc | |||
@@ -25,43 +25,14 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ | |||
25 | file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ | 25 | file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ |
26 | file://0001-Add-enable-disable-udev.patch \ | 26 | file://0001-Add-enable-disable-udev.patch \ |
27 | file://0001-qemu-Do-not-include-file-if-not-exists.patch \ | 27 | file://0001-qemu-Do-not-include-file-if-not-exists.patch \ |
28 | file://mingwfix.patch \ | ||
29 | file://mmap.patch \ | ||
30 | file://mmap2.patch \ | 28 | file://mmap2.patch \ |
31 | file://determinism.patch \ | 29 | file://determinism.patch \ |
32 | file://0001-tests-meson.build-use-relative-path-to-refer-to-file.patch \ | 30 | file://0001-tests-meson.build-use-relative-path-to-refer-to-file.patch \ |
33 | file://CVE-2021-20203.patch \ | ||
34 | file://CVE-2020-35517_1.patch \ | ||
35 | file://CVE-2020-35517_2.patch \ | ||
36 | file://CVE-2020-35517_3.patch \ | ||
37 | file://CVE-2021-20181.patch \ | ||
38 | file://CVE-2020-29443.patch \ | ||
39 | file://CVE-2021-20221.patch \ | ||
40 | file://CVE-2021-3409_1.patch \ | ||
41 | file://CVE-2021-3409_2.patch \ | ||
42 | file://CVE-2021-3409_3.patch \ | ||
43 | file://CVE-2021-3409_4.patch \ | ||
44 | file://CVE-2021-3409_5.patch \ | ||
45 | file://CVE-2021-3409_6.patch \ | ||
46 | file://CVE-2021-3416_1.patch \ | ||
47 | file://CVE-2021-3416_2.patch \ | ||
48 | file://CVE-2021-3416_3.patch \ | ||
49 | file://CVE-2021-3416_4.patch \ | ||
50 | file://CVE-2021-3416_5.patch \ | ||
51 | file://CVE-2021-3416_6.patch \ | ||
52 | file://CVE-2021-3416_7.patch \ | ||
53 | file://CVE-2021-3416_8.patch \ | ||
54 | file://CVE-2021-3416_9.patch \ | ||
55 | file://CVE-2021-3416_10.patch \ | ||
56 | file://CVE-2021-20257.patch \ | ||
57 | file://CVE-2020-27821.patch \ | ||
58 | file://CVE-2021-20263.patch \ | ||
59 | file://CVE-2021-3392.patch \ | ||
60 | file://0001-configure-fix-detection-of-gdbus-codegen.patch \ | 31 | file://0001-configure-fix-detection-of-gdbus-codegen.patch \ |
61 | " | 32 | " |
62 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" | 33 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" |
63 | 34 | ||
64 | SRC_URI[sha256sum] = "cb18d889b628fbe637672b0326789d9b0e3b8027e0445b936537c78549df17bc" | 35 | SRC_URI[sha256sum] = "87bc1a471ca24b97e7005711066007d443423d19aacda3d442558ae032fa30b9" |
65 | 36 | ||
66 | SRC_URI_append_class-target = " file://cross.patch" | 37 | SRC_URI_append_class-target = " file://cross.patch" |
67 | SRC_URI_append_class-nativesdk = " file://cross.patch" | 38 | SRC_URI_append_class-nativesdk = " file://cross.patch" |
@@ -94,8 +65,6 @@ do_install_ptest() { | |||
94 | find ${D}${PTEST_PATH}/tests -type f -name "*.[Sshcodp]" | xargs -i rm -rf {} | 65 | find ${D}${PTEST_PATH}/tests -type f -name "*.[Sshcodp]" | xargs -i rm -rf {} |
95 | 66 | ||
96 | # Don't check the file genreated by configure | 67 | # Don't check the file genreated by configure |
97 | sed -i -e 's,${HOSTTOOLS_DIR}/python3,${bindir}/python3,' \ | ||
98 | ${D}/${PTEST_PATH}/tests/qemu-iotests/common.env | ||
99 | sed -i -e "1s,#!/usr/bin/bash,#!${base_bindir}/bash," ${D}${PTEST_PATH}/tests/data/acpi/disassemle-aml.sh | 68 | sed -i -e "1s,#!/usr/bin/bash,#!${base_bindir}/bash," ${D}${PTEST_PATH}/tests/data/acpi/disassemle-aml.sh |
100 | 69 | ||
101 | # Strip the paths from the QEMU variable, we can use PATH | 70 | # Strip the paths from the QEMU variable, we can use PATH |
@@ -122,7 +91,7 @@ EXTRA_OECONF = " \ | |||
122 | --extra-cflags='${CFLAGS}' \ | 91 | --extra-cflags='${CFLAGS}' \ |
123 | --extra-ldflags='${LDFLAGS}' \ | 92 | --extra-ldflags='${LDFLAGS}' \ |
124 | --with-git=/bin/false \ | 93 | --with-git=/bin/false \ |
125 | --disable-git-update \ | 94 | --with-git-submodules=ignore \ |
126 | --meson=meson \ | 95 | --meson=meson \ |
127 | ${PACKAGECONFIG_CONFARGS} \ | 96 | ${PACKAGECONFIG_CONFARGS} \ |
128 | " | 97 | " |