diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-05 23:00:14 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-09 09:09:49 +0000 |
commit | 0d298198e57753213391788a8a9204d99648636b (patch) | |
tree | 043c08668b5e30472f230bf41b7837382d3636ac /meta/recipes-devtools/qemu/qemu.inc | |
parent | 10c69538c0cb8708c7eff9e8dc05ca7c669cb61c (diff) | |
download | poky-0d298198e57753213391788a8a9204d99648636b.tar.gz |
qemu: Upgrade 5.1.0->5.2.0
This involves some pretty major changes for qemu. In particular, they
switched to meson+ninja so we have to adapt to that.
Patch changes:
* CVE patches - dropped as backports
* cflags fix - upstream code changed significantly, need new patch if still issues
* mips TLB entries - dropped as merged upstream
* usb fix - dropped as merged upstream
* find_datadir - dropped as code no longer present that I could find
A patch was added to allow us to force the configure script into "cross" mode
without setting cross_prefix which has other effects we don't need/want.
Dependencies on meson/ninja were added.
Specifying the python interpreter causes the internal meson copy to be
built/used which is undesireable for us so don't do that. The correct
python is in PATH anyway.
Acked-by: Alistair Francis <alistair.francis@wdc.com>
(From OE-Core rev: 181c635567aafb9b4787d8d6d0bcd4a615ceae80)
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, 7 insertions, 12 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 4864d7e93c..23d0adb901 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc | |||
@@ -21,7 +21,6 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ | |||
21 | file://0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch \ | 21 | file://0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch \ |
22 | file://0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch \ | 22 | file://0003-qemu-Add-addition-environment-space-to-boot-loader-q.patch \ |
23 | file://0004-qemu-disable-Valgrind.patch \ | 23 | file://0004-qemu-disable-Valgrind.patch \ |
24 | file://0005-qemu-native-set-ld.bfd-fix-cflags-and-set-some-envir.patch \ | ||
25 | file://0006-chardev-connect-socket-to-a-spawned-command.patch \ | 24 | file://0006-chardev-connect-socket-to-a-spawned-command.patch \ |
26 | file://0007-apic-fixup-fallthrough-to-PIC.patch \ | 25 | file://0007-apic-fixup-fallthrough-to-PIC.patch \ |
27 | file://0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ | 26 | file://0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ |
@@ -29,18 +28,13 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ | |||
29 | file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ | 28 | file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ |
30 | file://0001-Add-enable-disable-udev.patch \ | 29 | file://0001-Add-enable-disable-udev.patch \ |
31 | file://0001-qemu-Do-not-include-file-if-not-exists.patch \ | 30 | file://0001-qemu-Do-not-include-file-if-not-exists.patch \ |
32 | file://find_datadir.patch \ | ||
33 | file://usb-fix-setup_len-init.patch \ | ||
34 | file://0001-target-mips-Increase-number-of-TLB-entries-on-the-34.patch \ | ||
35 | file://CVE-2020-24352.patch \ | ||
36 | file://CVE-2020-29129-CVE-2020-29130.patch \ | ||
37 | file://CVE-2020-25624.patch \ | ||
38 | file://CVE-2020-25723.patch \ | ||
39 | file://CVE-2020-28916.patch \ | ||
40 | " | 31 | " |
41 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" | 32 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" |
42 | 33 | ||
43 | SRC_URI[sha256sum] = "c9174eb5933d9eb5e61f541cd6d1184cd3118dfe4c5c4955bc1bdc4d390fa4e5" | 34 | SRC_URI[sha256sum] = "cb18d889b628fbe637672b0326789d9b0e3b8027e0445b936537c78549df17bc" |
35 | |||
36 | SRC_URI_append_class-target = " file://cross.patch" | ||
37 | SRC_URI_append_class-nativesdk = " file://cross.patch" | ||
44 | 38 | ||
45 | COMPATIBLE_HOST_mipsarchn32 = "null" | 39 | COMPATIBLE_HOST_mipsarchn32 = "null" |
46 | COMPATIBLE_HOST_mipsarchn64 = "null" | 40 | COMPATIBLE_HOST_mipsarchn64 = "null" |
@@ -85,13 +79,14 @@ EXTRA_OECONF = " \ | |||
85 | --sysconfdir=${sysconfdir} \ | 79 | --sysconfdir=${sysconfdir} \ |
86 | --libexecdir=${libexecdir} \ | 80 | --libexecdir=${libexecdir} \ |
87 | --localstatedir=${localstatedir} \ | 81 | --localstatedir=${localstatedir} \ |
88 | --with-confsuffix=/${BPN} \ | 82 | --with-suffix=${BPN} \ |
89 | --disable-strip \ | 83 | --disable-strip \ |
90 | --disable-werror \ | 84 | --disable-werror \ |
91 | --extra-cflags='${CFLAGS}' \ | 85 | --extra-cflags='${CFLAGS}' \ |
92 | --extra-ldflags='${LDFLAGS}' \ | 86 | --extra-ldflags='${LDFLAGS}' \ |
93 | --with-git=/bin/false \ | 87 | --with-git=/bin/false \ |
94 | --disable-git-update \ | 88 | --disable-git-update \ |
89 | --meson=meson \ | ||
95 | ${PACKAGECONFIG_CONFARGS} \ | 90 | ${PACKAGECONFIG_CONFARGS} \ |
96 | " | 91 | " |
97 | 92 | ||
@@ -99,7 +94,7 @@ export LIBTOOL="${HOST_SYS}-libtool" | |||
99 | 94 | ||
100 | B = "${WORKDIR}/build" | 95 | B = "${WORKDIR}/build" |
101 | 96 | ||
102 | EXTRA_OECONF_append = " --python=${HOSTTOOLS_DIR}/python3" | 97 | #EXTRA_OECONF_append = " --python=${HOSTTOOLS_DIR}/python3" |
103 | 98 | ||
104 | do_configure_prepend_class-native() { | 99 | do_configure_prepend_class-native() { |
105 | # Append build host pkg-config paths for native target since the host may provide sdl | 100 | # Append build host pkg-config paths for native target since the host may provide sdl |