diff options
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu')
3 files changed, 26 insertions, 90 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/0001-tracetool-use-relative-paths-for-line-preprocessor-d.patch b/meta/recipes-devtools/qemu/qemu/0001-tracetool-use-relative-paths-for-line-preprocessor-d.patch deleted file mode 100644 index 049b9a5105..0000000000 --- a/meta/recipes-devtools/qemu/qemu/0001-tracetool-use-relative-paths-for-line-preprocessor-d.patch +++ /dev/null | |||
@@ -1,84 +0,0 @@ | |||
1 | From 348ea441db84a211d4fca7ef5544b5cd06a8a872 Mon Sep 17 00:00:00 2001 | ||
2 | From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> | ||
3 | Date: Tue, 4 Apr 2023 15:26:07 +0200 | ||
4 | Subject: [PATCH] tracetool: use relative paths for '#line' preprocessor | ||
5 | directives | ||
6 | |||
7 | The event filename is an absolute path. Convert it to a relative path when | ||
8 | writing '#line' directives, to preserve reproducibility of the generated | ||
9 | output when different base paths are used. | ||
10 | |||
11 | Upstream-Status: Accepted [https://gitlab.com/qemu-project/qemu/-/commit/9d672e290475001fcecdcc9dc79ad088ff89d17f] | ||
12 | |||
13 | --- | ||
14 | scripts/tracetool/backend/ftrace.py | 4 +++- | ||
15 | scripts/tracetool/backend/log.py | 4 +++- | ||
16 | scripts/tracetool/backend/syslog.py | 4 +++- | ||
17 | 3 files changed, 9 insertions(+), 3 deletions(-) | ||
18 | |||
19 | Index: qemu-8.0.0/scripts/tracetool/backend/ftrace.py | ||
20 | =================================================================== | ||
21 | --- qemu-8.0.0.orig/scripts/tracetool/backend/ftrace.py | ||
22 | +++ qemu-8.0.0/scripts/tracetool/backend/ftrace.py | ||
23 | @@ -12,6 +12,8 @@ __maintainer__ = "Stefan Hajnoczi" | ||
24 | __email__ = "stefanha@redhat.com" | ||
25 | |||
26 | |||
27 | +import os.path | ||
28 | + | ||
29 | from tracetool import out | ||
30 | |||
31 | |||
32 | @@ -45,7 +47,7 @@ def generate_h(event, group): | ||
33 | args=event.args, | ||
34 | event_id="TRACE_" + event.name.upper(), | ||
35 | event_lineno=event.lineno, | ||
36 | - event_filename=event.filename, | ||
37 | + event_filename=os.path.relpath(event.filename), | ||
38 | fmt=event.fmt.rstrip("\n"), | ||
39 | argnames=argnames) | ||
40 | |||
41 | Index: qemu-8.0.0/scripts/tracetool/backend/log.py | ||
42 | =================================================================== | ||
43 | --- qemu-8.0.0.orig/scripts/tracetool/backend/log.py | ||
44 | +++ qemu-8.0.0/scripts/tracetool/backend/log.py | ||
45 | @@ -12,6 +12,8 @@ __maintainer__ = "Stefan Hajnoczi" | ||
46 | __email__ = "stefanha@redhat.com" | ||
47 | |||
48 | |||
49 | +import os.path | ||
50 | + | ||
51 | from tracetool import out | ||
52 | |||
53 | |||
54 | @@ -53,7 +55,7 @@ def generate_h(event, group): | ||
55 | ' }', | ||
56 | cond=cond, | ||
57 | event_lineno=event.lineno, | ||
58 | - event_filename=event.filename, | ||
59 | + event_filename=os.path.relpath(event.filename), | ||
60 | name=event.name, | ||
61 | fmt=event.fmt.rstrip("\n"), | ||
62 | argnames=argnames) | ||
63 | Index: qemu-8.0.0/scripts/tracetool/backend/syslog.py | ||
64 | =================================================================== | ||
65 | --- qemu-8.0.0.orig/scripts/tracetool/backend/syslog.py | ||
66 | +++ qemu-8.0.0/scripts/tracetool/backend/syslog.py | ||
67 | @@ -12,6 +12,8 @@ __maintainer__ = "Stefan Hajnoczi" | ||
68 | __email__ = "stefanha@redhat.com" | ||
69 | |||
70 | |||
71 | +import os.path | ||
72 | + | ||
73 | from tracetool import out | ||
74 | |||
75 | |||
76 | @@ -41,7 +43,7 @@ def generate_h(event, group): | ||
77 | ' }', | ||
78 | cond=cond, | ||
79 | event_lineno=event.lineno, | ||
80 | - event_filename=event.filename, | ||
81 | + event_filename=os.path.relpath(event.filename), | ||
82 | name=event.name, | ||
83 | fmt=event.fmt.rstrip("\n"), | ||
84 | argnames=argnames) | ||
diff --git a/meta/recipes-devtools/qemu/qemu/0004-configure-Add-pkg-config-handling-for-libgcrypt.patch b/meta/recipes-devtools/qemu/qemu/0004-configure-Add-pkg-config-handling-for-libgcrypt.patch index 02f22143c1..f981a64a54 100644 --- a/meta/recipes-devtools/qemu/qemu/0004-configure-Add-pkg-config-handling-for-libgcrypt.patch +++ b/meta/recipes-devtools/qemu/qemu/0004-configure-Add-pkg-config-handling-for-libgcrypt.patch | |||
@@ -14,16 +14,16 @@ Signed-off-by: He Zhe <zhe.he@windriver.com> | |||
14 | meson.build | 2 +- | 14 | meson.build | 2 +- |
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | 15 | 1 file changed, 1 insertion(+), 1 deletion(-) |
16 | 16 | ||
17 | Index: qemu-8.0.0/meson.build | 17 | Index: qemu-8.1.0/meson.build |
18 | =================================================================== | 18 | =================================================================== |
19 | --- qemu-8.0.0.orig/meson.build | 19 | --- qemu-8.1.0.orig/meson.build |
20 | +++ qemu-8.0.0/meson.build | 20 | +++ qemu-8.1.0/meson.build |
21 | @@ -1213,7 +1213,7 @@ endif | 21 | @@ -1481,7 +1481,7 @@ endif |
22 | if not gnutls_crypto.found() | 22 | if not gnutls_crypto.found() |
23 | if (not get_option('gcrypt').auto() or have_system) and not get_option('nettle').enabled() | 23 | if (not get_option('gcrypt').auto() or have_system) and not get_option('nettle').enabled() |
24 | gcrypt = dependency('libgcrypt', version: '>=1.8', | 24 | gcrypt = dependency('libgcrypt', version: '>=1.8', |
25 | - method: 'config-tool', | 25 | - method: 'config-tool', |
26 | + method: 'pkg-config', | 26 | + method: 'pkg-config', |
27 | required: get_option('gcrypt'), | 27 | required: get_option('gcrypt')) |
28 | kwargs: static_kwargs) | ||
29 | # Debian has removed -lgpg-error from libgcrypt-config | 28 | # Debian has removed -lgpg-error from libgcrypt-config |
29 | # as it "spreads unnecessary dependencies" which in | ||
diff --git a/meta/recipes-devtools/qemu/qemu/fixedmeson.patch b/meta/recipes-devtools/qemu/qemu/fixedmeson.patch new file mode 100644 index 0000000000..0cbaea07ca --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/fixedmeson.patch | |||
@@ -0,0 +1,20 @@ | |||
1 | Upstream-Status: Inappropriate [workaround, would need a real fix for upstream] | ||
2 | |||
3 | Index: qemu-8.1.0/configure | ||
4 | =================================================================== | ||
5 | --- qemu-8.1.0.orig/configure | ||
6 | +++ qemu-8.1.0/configure | ||
7 | @@ -1032,12 +1032,7 @@ then | ||
8 | exit 1 | ||
9 | fi | ||
10 | |||
11 | -# At this point, we expect Meson to be installed and available. | ||
12 | -# We expect mkvenv or pip to have created pyvenv/bin/meson for us. | ||
13 | -# We ignore PATH completely here: we want to use the venv's Meson | ||
14 | -# *exclusively*. | ||
15 | - | ||
16 | -meson="$(cd pyvenv/bin; pwd)/meson" | ||
17 | +meson=`which meson` | ||
18 | |||
19 | # Conditionally ensure Sphinx is installed. | ||
20 | |||