diff options
author | Sakib Sajal <sakib.sajal@windriver.com> | 2020-06-19 14:12:59 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-06-23 12:31:03 +0100 |
commit | a3102471e4e789d77040f5ed0da1b8e438328b5f (patch) | |
tree | 083c7ac42e426047f32ba8de41d0a9b24615593f /meta/recipes-devtools/qemu/qemu.inc | |
parent | f5bbb3ba2d65ba7911b7ede5fb32b54b5b904a07 (diff) | |
download | poky-a3102471e4e789d77040f5ed0da1b8e438328b5f.tar.gz |
qemu: uprev v4.2.0 -> v5.0.0
Major update after v4.2.
Changes:
- os_find_datadir() was changed after the v4.2 release
causing v5.0 to not find the bios and not boot the
image. Fix is sent to upstream qemu.
See: qemu/find_datadir.patch
- v5.0 binary had host contamination for dynamically linked
libraries, "--extra-ldflags='${LDFLAGS}'" in EXTRA_OECONF
resolved the issue
- bluetooth code was removed: qemu.git$ git show 1d4ffe8dc7
hence removed PACKAGECONFIG[bluez]
- -show-cursor qemu option is now deprecated, updated
scripts/runqemu to use updated option instead
- added PACKAGECONFIG definitions
- added qemu-ptest to conf/distro/include/ptest-packagelists.inc
- increased support for ARM architecture, cpu and board
- removed patches merged upstream and refreshed
existing ones
Testing:
Build core-image-minimal against the machines in
openembedded-core/meta/conf/machine and succesfully
booted with qemu v5.0
Ran qemu-ptest on x86-64 and arm64 with identical results:
PASS: 1166
SKIP: 0
FAIL: 0
(From OE-Core rev: ee9ec9e344541c1ccd9b9b8e3b8c1e00d008ad85)
Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
Signed-off-by: Joe Slater <joe.slater@windriver.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 | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 3e5006937b..8b6157e69d 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc | |||
@@ -27,23 +27,15 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ | |||
27 | file://0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ | 27 | file://0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch \ |
28 | file://0009-Fix-webkitgtk-builds.patch \ | 28 | file://0009-Fix-webkitgtk-builds.patch \ |
29 | file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ | 29 | file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ |
30 | file://0011-hw-i386-pc-fix-regression-in-parsing-vga-cmdline-par.patch \ | ||
31 | file://CVE-2019-15890.patch \ | ||
32 | file://CVE-2020-1711.patch \ | ||
33 | file://CVE-2020-7039-1.patch \ | ||
34 | file://CVE-2020-7039-2.patch \ | ||
35 | file://CVE-2020-7039-3.patch \ | ||
36 | file://0001-Add-enable-disable-udev.patch \ | 30 | file://0001-Add-enable-disable-udev.patch \ |
37 | file://CVE-2020-7211.patch \ | ||
38 | file://0001-qemu-Do-not-include-file-if-not-exists.patch \ | 31 | file://0001-qemu-Do-not-include-file-if-not-exists.patch \ |
39 | file://CVE-2020-11102.patch \ | ||
40 | file://CVE-2020-11869.patch \ | ||
41 | file://CVE-2020-13361.patch \ | 32 | file://CVE-2020-13361.patch \ |
33 | file://find_datadir.patch \ | ||
42 | " | 34 | " |
43 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" | 35 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" |
44 | 36 | ||
45 | SRC_URI[md5sum] = "278eeb294e4b497e79af7a57e660cb9a" | 37 | SRC_URI[md5sum] = "ede6005d7143fe994dd089d31dc2cf6c" |
46 | SRC_URI[sha256sum] = "d3481d4108ce211a053ef15be69af1bdd9dde1510fda80d92be0f6c3e98768f0" | 38 | SRC_URI[sha256sum] = "2f13a92a0fa5c8b69ff0796b59b86b080bbb92ebad5d301a7724dd06b5e78cb6" |
47 | 39 | ||
48 | COMPATIBLE_HOST_mipsarchn32 = "null" | 40 | COMPATIBLE_HOST_mipsarchn32 = "null" |
49 | COMPATIBLE_HOST_mipsarchn64 = "null" | 41 | COMPATIBLE_HOST_mipsarchn64 = "null" |
@@ -87,6 +79,7 @@ EXTRA_OECONF = " \ | |||
87 | --disable-strip \ | 79 | --disable-strip \ |
88 | --disable-werror \ | 80 | --disable-werror \ |
89 | --extra-cflags='${CFLAGS}' \ | 81 | --extra-cflags='${CFLAGS}' \ |
82 | --extra-ldflags='${LDFLAGS}' \ | ||
90 | --with-git=/bin/false \ | 83 | --with-git=/bin/false \ |
91 | --disable-git-update \ | 84 | --disable-git-update \ |
92 | ${PACKAGECONFIG_CONFARGS} \ | 85 | ${PACKAGECONFIG_CONFARGS} \ |
@@ -170,7 +163,6 @@ PACKAGECONFIG[lzo] = "--enable-lzo,--disable-lzo,lzo" | |||
170 | PACKAGECONFIG[numa] = "--enable-numa,--disable-numa,numactl" | 163 | PACKAGECONFIG[numa] = "--enable-numa,--disable-numa,numactl" |
171 | PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls" | 164 | PACKAGECONFIG[gnutls] = "--enable-gnutls,--disable-gnutls,gnutls" |
172 | PACKAGECONFIG[bzip2] = "--enable-bzip2,--disable-bzip2,bzip2" | 165 | PACKAGECONFIG[bzip2] = "--enable-bzip2,--disable-bzip2,bzip2" |
173 | PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,bluez5" | ||
174 | PACKAGECONFIG[libiscsi] = "--enable-libiscsi,--disable-libiscsi" | 166 | PACKAGECONFIG[libiscsi] = "--enable-libiscsi,--disable-libiscsi" |
175 | PACKAGECONFIG[kvm] = "--enable-kvm,--disable-kvm" | 167 | PACKAGECONFIG[kvm] = "--enable-kvm,--disable-kvm" |
176 | PACKAGECONFIG[virglrenderer] = "--enable-virglrenderer,--disable-virglrenderer,virglrenderer" | 168 | PACKAGECONFIG[virglrenderer] = "--enable-virglrenderer,--disable-virglrenderer,virglrenderer" |
@@ -179,10 +171,15 @@ PACKAGECONFIG[spice] = "--enable-spice,--disable-spice,spice" | |||
179 | # usbredir will be in meta-networking layer | 171 | # usbredir will be in meta-networking layer |
180 | PACKAGECONFIG[usb-redir] = "--enable-usb-redir,--disable-usb-redir,usbredir" | 172 | PACKAGECONFIG[usb-redir] = "--enable-usb-redir,--disable-usb-redir,usbredir" |
181 | PACKAGECONFIG[snappy] = "--enable-snappy,--disable-snappy,snappy" | 173 | PACKAGECONFIG[snappy] = "--enable-snappy,--disable-snappy,snappy" |
182 | PACKAGECONFIG[glusterfs] = "--enable-glusterfs,--disable-glusterfs" | 174 | PACKAGECONFIG[glusterfs] = "--enable-glusterfs,--disable-glusterfs,glusterfs" |
183 | PACKAGECONFIG[xkbcommon] = "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon" | 175 | PACKAGECONFIG[xkbcommon] = "--enable-xkbcommon,--disable-xkbcommon,libxkbcommon" |
184 | PACKAGECONFIG[libudev] = "--enable-libudev,--disable-libudev,eudev" | 176 | PACKAGECONFIG[libudev] = "--enable-libudev,--disable-libudev,eudev" |
185 | PACKAGECONFIG[libxml2] = "--enable-libxml2,--disable-libxml2,libxml2" | 177 | PACKAGECONFIG[libxml2] = "--enable-libxml2,--disable-libxml2,libxml2" |
178 | PACKAGECONFIG[attr] = "--enable-attr,--disable-attr,attr," | ||
179 | PACKAGECONFIG[rbd] = "--enable-rbd,--disable-rbd,ceph,ceph" | ||
180 | PACKAGECONFIG[vhost] = "--enable-vhost-net,--disable-vhost-net,," | ||
181 | PACKAGECONFIG[ust] = "--enable-trace-backend=ust,--enable-trace-backend=nop,lttng-ust," | ||
182 | PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,," | ||
186 | 183 | ||
187 | INSANE_SKIP_${PN} = "arch" | 184 | INSANE_SKIP_${PN} = "arch" |
188 | 185 | ||