summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2021-05-13 22:56:22 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-05-14 07:57:28 +0100
commit74fbe5578a23de88155b207f241f77e20093bcbd (patch)
tree4ad32ca23b861d86762c448f87b6b6140f5699c1 /meta
parent2077235f35e1b7c63f6f5f741f9d7da4d88db734 (diff)
downloadpoky-74fbe5578a23de88155b207f241f77e20093bcbd.tar.gz
qemu: backport a patch to fix meson 0.58 builds
(From OE-Core rev: fe6889ed05edf2f1e4ac7b06debd4cc43ebb9607) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc1
-rw-r--r--meta/recipes-devtools/qemu/qemu/0001-configure-fix-detection-of-gdbus-codegen.patch53
2 files changed, 54 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 82d1cb5566..74c53c6309 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -57,6 +57,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
57 file://CVE-2020-27821.patch \ 57 file://CVE-2020-27821.patch \
58 file://CVE-2021-20263.patch \ 58 file://CVE-2021-20263.patch \
59 file://CVE-2021-3392.patch \ 59 file://CVE-2021-3392.patch \
60 file://0001-configure-fix-detection-of-gdbus-codegen.patch \
60 " 61 "
61UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" 62UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
62 63
diff --git a/meta/recipes-devtools/qemu/qemu/0001-configure-fix-detection-of-gdbus-codegen.patch b/meta/recipes-devtools/qemu/qemu/0001-configure-fix-detection-of-gdbus-codegen.patch
new file mode 100644
index 0000000000..1f20077883
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/0001-configure-fix-detection-of-gdbus-codegen.patch
@@ -0,0 +1,53 @@
1From 464cfc64201b21386030b8f353fe9724a3413a85 Mon Sep 17 00:00:00 2001
2From: Paolo Bonzini <pbonzini@redhat.com>
3Date: Wed, 5 May 2021 10:15:34 -0400
4Subject: [PATCH] configure: fix detection of gdbus-codegen
5
6"pkg-config --variable=gdbus_codegen gio-2.0" returns "gdbus-codegen",
7and it does not pass test -x (which does not walk the path).
8
9Meson 0.58.0 notices that something is iffy, as the dbus_vmstate1
10assignment in tests/qtest/meson.build uses an empty string as the
11command, and fails very eloquently:
12
13../tests/qtest/meson.build:92:2: ERROR: No program name specified.
14
15Use the "has" function instead of test -x, and fix the generation
16of config-host.mak since meson.build expects that GDBUS_CODEGEN
17is absent, rather than empty, if the tool is unavailable.
18
19Reported-by: Sebastian Mitterle <smitterl@redhat.com>
20Fixes: #178
21Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
22Upstream-Status: Backport [https://git.qemu.org/?p=qemu.git;a=commitdiff;h=5ecfb76ccc056eb6127e44268e475827ae73b9e0]
23(not in 6.0.0, should be kept when upgrading)
24Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
25---
26 configure | 4 +++-
27 1 file changed, 3 insertions(+), 1 deletion(-)
28
29diff --git a/configure b/configure
30index 18c26e0389..4c36e221d3 100755
31--- a/configure
32+++ b/configure
33@@ -3496,7 +3496,7 @@ if $pkg_config --atleast-version=$glib_req_ver gio-2.0; then
34 gio_cflags=$($pkg_config --cflags gio-2.0)
35 gio_libs=$($pkg_config --libs gio-2.0)
36 gdbus_codegen=$($pkg_config --variable=gdbus_codegen gio-2.0)
37- if [ ! -x "$gdbus_codegen" ]; then
38+ if ! has "$gdbus_codegen"; then
39 gdbus_codegen=
40 fi
41 # Check that the libraries actually work -- Ubuntu 18.04 ships
42@@ -6172,6 +6172,8 @@ if test "$gio" = "yes" ; then
43 echo "CONFIG_GIO=y" >> $config_host_mak
44 echo "GIO_CFLAGS=$gio_cflags" >> $config_host_mak
45 echo "GIO_LIBS=$gio_libs" >> $config_host_mak
46+fi
47+if test "$gdbus_codegen" != "" ; then
48 echo "GDBUS_CODEGEN=$gdbus_codegen" >> $config_host_mak
49 fi
50 echo "CONFIG_TLS_PRIORITY=\"$tls_priority\"" >> $config_host_mak
51--
522.24.0
53