qemu: Upgrade 9.0.1 -> 9.1.0

Drop the gnutls patch since something equivalent was merged upsteam.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 1d2771239e7d82abbabf2f51f702a9297d59e1d7..b1cc8b128554c07134b25a1d97b2640006d639a4 100644 (file)
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -22,7 +22,7 @@ BINUVERSION ?= "2.43%"
 GDBVERSION ?= "15.%"
 GLIBCVERSION ?= "2.40%"
 LINUXLIBCVERSION ?= "6.10%"
-QEMUVERSION ?= "9.0%"
+QEMUVERSION ?= "9.1%"
 GOVERSION ?= "1.22%"
 RUSTVERSION ?= "1.79%"
 

diff --git a/meta/recipes-devtools/qemu/qemu-native_9.0.2.bb b/meta/recipes-devtools/qemu/qemu-native_9.1.0.bb
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-native_9.0.2.bb
rename to meta/recipes-devtools/qemu/qemu-native_9.1.0.bb

diff --git a/meta/recipes-devtools/qemu/qemu-system-native_9.0.2.bb b/meta/recipes-devtools/qemu/qemu-system-native_9.1.0.bb
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-system-native_9.0.2.bb
rename to meta/recipes-devtools/qemu/qemu-system-native_9.1.0.bb

diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 223de71efee31db66667ff477e4d0096b72e945e..02cd7c8dc8f8c7838a201fd42cb87f7632c32bd0 100644 (file)
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -24,7 +24,6 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
            file://fix-strerrorname_np.patch \
            file://0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch \
            file://0002-apic-fixup-fallthrough-to-PIC.patch \
-           file://0003-configure-Add-pkg-config-handling-for-libgcrypt.patch \
            file://0004-qemu-Do-not-include-file-if-not-exists.patch \
            file://0005-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch \
            file://0006-qemu-Determinism-fixes.patch \
@@ -39,7 +38,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
            "
 UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
 
-SRC_URI[sha256sum] = "a8c3f596aece96da3b00cafb74baafa0d14515eafb8ed1ee3f7f5c2d0ebf02b6"
+SRC_URI[sha256sum] = "816b7022a8ba7c2ac30e2e0cf973e826f6bcc8505339603212c5ede8e94d7834"
 
 CVE_STATUS[CVE-2007-0998] = "not-applicable-config: The VNC server can expose host files uder some circumstances. We don't enable it by default."
 

diff --git a/meta/recipes-devtools/qemu/qemu/0003-configure-Add-pkg-config-handling-for-libgcrypt.patch b/meta/recipes-devtools/qemu/qemu/0003-configure-Add-pkg-config-handling-for-libgcrypt.patch
deleted file mode 100644 (file)
index 30e269f..0000000
--- a/meta/recipes-devtools/qemu/qemu/0003-configure-Add-pkg-config-handling-for-libgcrypt.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From e4f6c6b9f43b28271bc9dc6cbcafad53f80387e0 Mon Sep 17 00:00:00 2001
-From: He Zhe <zhe.he@windriver.com>
-Date: Wed, 28 Aug 2019 19:56:28 +0800
-Subject: [PATCH 03/11] configure: Add pkg-config handling for libgcrypt
-
-libgcrypt may also be controlled by pkg-config, this patch adds pkg-config
-handling for libgcrypt.
-
-Upstream-Status: Denied [https://lists.nongnu.org/archive/html/qemu-devel/2019-08/msg06333.html]
-
-Signed-off-by: He Zhe <zhe.he@windriver.com>
----
- meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index 91a0aa64c6..e8373d55b8 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1655,7 +1655,7 @@ endif
- if not gnutls_crypto.found()
-   if (not get_option('gcrypt').auto() or have_system) and not get_option('nettle').enabled()
-     gcrypt = dependency('libgcrypt', version: '>=1.8',
--                        method: 'config-tool',
-+                        method: 'pkg-config',
-                         required: get_option('gcrypt'))
-     # Debian has removed -lgpg-error from libgcrypt-config
-     # as it "spreads unnecessary dependencies" which in
--- 
-2.44.0
-

diff --git a/meta/recipes-devtools/qemu/qemu/0007-tests-meson.build-use-relative-path-to-refer-to-file.patch b/meta/recipes-devtools/qemu/qemu/0007-tests-meson.build-use-relative-path-to-refer-to-file.patch
index 74de158b2e37e1ac2a79e543c7b8b9cfb05530ca..5471b77e18d361d741d8b8e789d63f221a7912f6 100644 (file)
--- a/meta/recipes-devtools/qemu/qemu/0007-tests-meson.build-use-relative-path-to-refer-to-file.patch
+++ b/meta/recipes-devtools/qemu/qemu/0007-tests-meson.build-use-relative-path-to-refer-to-file.patch
@@ -16,20 +16,23 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
  tests/unit/meson.build | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/tests/unit/meson.build b/tests/unit/meson.build
-index 228a21d03c..272fb4c6ca 100644
---- a/tests/unit/meson.build
-+++ b/tests/unit/meson.build
-@@ -47,7 +47,7 @@ tests = {
-   'test-keyval': [testqapi],
-   'test-logging': [],
-   'test-uuid': [],
--  'ptimer-test': ['ptimer-test-stubs.c', meson.project_source_root() / 'hw/core/ptimer.c'],
-+  'ptimer-test': ['ptimer-test-stubs.c', '../../hw/core/ptimer.c'],
-   'test-qapi-util': [],
-   'test-interval-tree': [],
-   'test-xs-node': [qom],
-@@ -138,7 +138,7 @@ if have_system
+Index: qemu-9.1.0/tests/unit/meson.build
+===================================================================
+--- qemu-9.1.0.orig/tests/unit/meson.build
++++ qemu-9.1.0/tests/unit/meson.build
+@@ -128,17 +128,17 @@ endif
+ 
+ if have_system
+   tests += {
+-    'ptimer-test': ['ptimer-test-stubs.c', meson.project_source_root() / 'hw/core/ptimer.c'],
++    'ptimer-test': ['ptimer-test-stubs.c', '../../hw/core/ptimer.c'],
+     'test-iov': [],
+     'test-opts-visitor': [testqapi],
+     'test-xs-node': [qom],
+-    'test-virtio-dmabuf': [meson.project_source_root() / 'hw/display/virtio-dmabuf.c'],
++    'test-virtio-dmabuf': ['../../hw/display/virtio-dmabuf.c'],
+     'test-qmp-cmds': [testqapi],
+     'test-xbzrle': [migration],
      'test-util-sockets': ['socket-helpers.c'],
      'test-base64': [],
      'test-bufferiszero': [],
@@ -38,6 +41,3 @@ index 228a21d03c..272fb4c6ca 100644
      'test-vmstate': [migration, io],
      'test-yank': ['socket-helpers.c', qom, io, chardev]
    }
--- 
-2.44.0
-

diff --git a/meta/recipes-devtools/qemu/qemu_9.0.2.bb b/meta/recipes-devtools/qemu/qemu_9.1.0.bb
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu_9.0.2.bb
rename to meta/recipes-devtools/qemu/qemu_9.1.0.bb