diff options
-rw-r--r-- | meta/conf/distro/include/tcmode-default.inc | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu-native_6.2.0.bb (renamed from meta/recipes-devtools/qemu/qemu-native_6.1.0.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu-system-native_6.2.0.bb (renamed from meta/recipes-devtools/qemu/qemu-system-native_6.1.0.bb) | 0 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 6 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/0001-linux-user-Replace-__u64-with-uint64_t.patch | 31 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/0001-tests-meson.build-use-relative-path-to-refer-to-file.patch | 13 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch | 30 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu_6.2.0.bb (renamed from meta/recipes-devtools/qemu/qemu_6.1.0.bb) | 0 |
8 files changed, 27 insertions, 55 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc index d858869bbd..49e99af8f2 100644 --- a/meta/conf/distro/include/tcmode-default.inc +++ b/meta/conf/distro/include/tcmode-default.inc | |||
@@ -22,7 +22,7 @@ BINUVERSION ?= "2.37%" | |||
22 | GDBVERSION ?= "11.%" | 22 | GDBVERSION ?= "11.%" |
23 | GLIBCVERSION ?= "2.34" | 23 | GLIBCVERSION ?= "2.34" |
24 | LINUXLIBCVERSION ?= "5.15%" | 24 | LINUXLIBCVERSION ?= "5.15%" |
25 | QEMUVERSION ?= "6.1%" | 25 | QEMUVERSION ?= "6.2%" |
26 | GOVERSION ?= "1.17%" | 26 | GOVERSION ?= "1.17%" |
27 | # This can not use wildcards like 8.0.% since it is also used in mesa to denote | 27 | # This can not use wildcards like 8.0.% since it is also used in mesa to denote |
28 | # llvm version being used, so always bump it with llvm recipe version bump | 28 | # llvm version being used, so always bump it with llvm recipe version bump |
diff --git a/meta/recipes-devtools/qemu/qemu-native_6.1.0.bb b/meta/recipes-devtools/qemu/qemu-native_6.2.0.bb index a94dc0b61e..a94dc0b61e 100644 --- a/meta/recipes-devtools/qemu/qemu-native_6.1.0.bb +++ b/meta/recipes-devtools/qemu/qemu-native_6.2.0.bb | |||
diff --git a/meta/recipes-devtools/qemu/qemu-system-native_6.1.0.bb b/meta/recipes-devtools/qemu/qemu-system-native_6.2.0.bb index b544ab4e81..b544ab4e81 100644 --- a/meta/recipes-devtools/qemu/qemu-system-native_6.1.0.bb +++ b/meta/recipes-devtools/qemu/qemu-system-native_6.2.0.bb | |||
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 584c9482e9..fe838276be 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc | |||
@@ -26,12 +26,11 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ | |||
26 | file://mmap2.patch \ | 26 | file://mmap2.patch \ |
27 | file://determinism.patch \ | 27 | file://determinism.patch \ |
28 | file://0001-tests-meson.build-use-relative-path-to-refer-to-file.patch \ | 28 | file://0001-tests-meson.build-use-relative-path-to-refer-to-file.patch \ |
29 | file://0001-linux-user-Replace-__u64-with-uint64_t.patch \ | ||
30 | file://0001-riscv-Set-5.4-as-minimum-kernel-version-for-riscv32.patch \ | 29 | file://0001-riscv-Set-5.4-as-minimum-kernel-version-for-riscv32.patch \ |
31 | " | 30 | " |
32 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" | 31 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" |
33 | 32 | ||
34 | SRC_URI[sha256sum] = "eebc089db3414bbeedf1e464beda0a7515aad30f73261abc246c9b27503a3c96" | 33 | SRC_URI[sha256sum] = "68e15d8e45ac56326e0b9a4afa8b49a3dfe8aba3488221d098c84698bca65b45" |
35 | 34 | ||
36 | SRC_URI:append:class-target = " file://cross.patch" | 35 | SRC_URI:append:class-target = " file://cross.patch" |
37 | SRC_URI:append:class-nativesdk = " file://cross.patch" | 36 | SRC_URI:append:class-nativesdk = " file://cross.patch" |
@@ -173,7 +172,7 @@ PACKAGECONFIG[gcrypt] = "--enable-gcrypt,--disable-gcrypt,libgcrypt," | |||
173 | PACKAGECONFIG[nettle] = "--enable-nettle,--disable-nettle,nettle" | 172 | PACKAGECONFIG[nettle] = "--enable-nettle,--disable-nettle,nettle" |
174 | PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb1" | 173 | PACKAGECONFIG[libusb] = "--enable-libusb,--disable-libusb,libusb1" |
175 | PACKAGECONFIG[fdt] = "--enable-fdt,--disable-fdt,dtc" | 174 | PACKAGECONFIG[fdt] = "--enable-fdt,--disable-fdt,dtc" |
176 | PACKAGECONFIG[alsa] = "--audio-drv-list='oss alsa',,alsa-lib" | 175 | PACKAGECONFIG[alsa] = "--audio-drv-list=default,,alsa-lib" |
177 | PACKAGECONFIG[glx] = "--enable-opengl,--disable-opengl,virtual/libgl" | 176 | PACKAGECONFIG[glx] = "--enable-opengl,--disable-opengl,virtual/libgl" |
178 | PACKAGECONFIG[lzo] = "--enable-lzo,--disable-lzo,lzo" | 177 | PACKAGECONFIG[lzo] = "--enable-lzo,--disable-lzo,lzo" |
179 | PACKAGECONFIG[numa] = "--enable-numa,--disable-numa,numactl" | 178 | PACKAGECONFIG[numa] = "--enable-numa,--disable-numa,numactl" |
@@ -200,6 +199,7 @@ PACKAGECONFIG[seccomp] = "--enable-seccomp,--disable-seccomp,libseccomp" | |||
200 | # libnfs is currently provided by meta-kodi | 199 | # libnfs is currently provided by meta-kodi |
201 | PACKAGECONFIG[libnfs] = "--enable-libnfs,--disable-libnfs,libnfs" | 200 | PACKAGECONFIG[libnfs] = "--enable-libnfs,--disable-libnfs,libnfs" |
202 | PACKAGECONFIG[pmem] = "--enable-libpmem,--disable-libpmem,pmdk" | 201 | PACKAGECONFIG[pmem] = "--enable-libpmem,--disable-libpmem,pmdk" |
202 | PACKAGECONFIG[pulsedio] = "--enable-pa,--disable-pa,pulseaudio" | ||
203 | 203 | ||
204 | INSANE_SKIP:${PN} = "arch" | 204 | INSANE_SKIP:${PN} = "arch" |
205 | 205 | ||
diff --git a/meta/recipes-devtools/qemu/qemu/0001-linux-user-Replace-__u64-with-uint64_t.patch b/meta/recipes-devtools/qemu/qemu/0001-linux-user-Replace-__u64-with-uint64_t.patch deleted file mode 100644 index 3d5c890b0f..0000000000 --- a/meta/recipes-devtools/qemu/qemu/0001-linux-user-Replace-__u64-with-uint64_t.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | From 5cc7b63299602d0aa8b57c684bbd9829856d54ad Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 8 Nov 2021 11:39:26 -0800 | ||
4 | Subject: [PATCH] linux-user: Replace __u64 with uint64_t | ||
5 | |||
6 | uint64_t is available in all userspaces via compiler include stdint.h | ||
7 | therefore use it instead of __u64 which is linux internal type, it fixes | ||
8 | build on some platforms eg. aarch64 systems using musl C library | ||
9 | |||
10 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2021-11/msg01955.html] | ||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | linux-user/host/aarch64/hostdep.h | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/linux-user/host/aarch64/hostdep.h b/linux-user/host/aarch64/hostdep.h | ||
17 | index a8d41a21ad..34d934f665 100644 | ||
18 | --- a/linux-user/host/aarch64/hostdep.h | ||
19 | +++ b/linux-user/host/aarch64/hostdep.h | ||
20 | @@ -25,7 +25,7 @@ extern char safe_syscall_end[]; | ||
21 | static inline void rewind_if_in_safe_syscall(void *puc) | ||
22 | { | ||
23 | ucontext_t *uc = puc; | ||
24 | - __u64 *pcreg = &uc->uc_mcontext.pc; | ||
25 | + uint64_t *pcreg = &uc->uc_mcontext.pc; | ||
26 | |||
27 | if (*pcreg > (uintptr_t)safe_syscall_start | ||
28 | && *pcreg < (uintptr_t)safe_syscall_end) { | ||
29 | -- | ||
30 | 2.33.1 | ||
31 | |||
diff --git a/meta/recipes-devtools/qemu/qemu/0001-tests-meson.build-use-relative-path-to-refer-to-file.patch b/meta/recipes-devtools/qemu/qemu/0001-tests-meson.build-use-relative-path-to-refer-to-file.patch index d5e1ab4d51..fcef129181 100644 --- a/meta/recipes-devtools/qemu/qemu/0001-tests-meson.build-use-relative-path-to-refer-to-file.patch +++ b/meta/recipes-devtools/qemu/qemu/0001-tests-meson.build-use-relative-path-to-refer-to-file.patch | |||
@@ -16,16 +16,19 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> | |||
16 | tests/meson.build | 2 +- | 16 | tests/meson.build | 2 +- |
17 | 1 files changed, 1 insertions(+), 1 deletion(-) | 17 | 1 files changed, 1 insertions(+), 1 deletion(-) |
18 | 18 | ||
19 | Index: qemu-6.0.0/tests/unit/meson.build | 19 | Index: qemu-6.2.0/tests/unit/meson.build |
20 | =================================================================== | 20 | =================================================================== |
21 | --- qemu-6.0.0.orig/tests/unit/meson.build | 21 | --- qemu-6.2.0.orig/tests/unit/meson.build |
22 | +++ qemu-6.0.0/tests/unit/meson.build | 22 | +++ qemu-6.2.0/tests/unit/meson.build |
23 | @@ -42,7 +42,7 @@ tests = { | 23 | @@ -44,9 +44,9 @@ tests = { |
24 | 'test-keyval': [testqapi], | 24 | 'test-keyval': [testqapi], |
25 | 'test-logging': [], | 25 | 'test-logging': [], |
26 | 'test-uuid': [], | 26 | 'test-uuid': [], |
27 | - 'ptimer-test': ['ptimer-test-stubs.c', meson.source_root() / 'hw/core/ptimer.c'], | 27 | - 'ptimer-test': ['ptimer-test-stubs.c', meson.project_source_root() / 'hw/core/ptimer.c'], |
28 | + 'ptimer-test': ['ptimer-test-stubs.c', '../../hw/core/ptimer.c'], | 28 | + 'ptimer-test': ['ptimer-test-stubs.c', '../../hw/core/ptimer.c'], |
29 | 'test-qapi-util': [], | 29 | 'test-qapi-util': [], |
30 | - 'test-smp-parse': [qom, meson.project_source_root() / 'hw/core/machine-smp.c'], | ||
31 | + 'test-smp-parse': [qom, '../../hw/core/machine-smp.c'], | ||
30 | } | 32 | } |
31 | 33 | ||
34 | if have_system or have_tools | ||
diff --git a/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch b/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch index 05dc849dad..cf8b0e7a45 100644 --- a/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch +++ b/meta/recipes-devtools/qemu/qemu/0006-chardev-connect-socket-to-a-spawned-command.patch | |||
@@ -51,10 +51,10 @@ Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> | |||
51 | qapi/char.json | 5 +++ | 51 | qapi/char.json | 5 +++ |
52 | 3 files changed, 109 insertions(+) | 52 | 3 files changed, 109 insertions(+) |
53 | 53 | ||
54 | Index: qemu-6.0.0/chardev/char-socket.c | 54 | Index: qemu-6.2.0/chardev/char-socket.c |
55 | =================================================================== | 55 | =================================================================== |
56 | --- qemu-6.0.0.orig/chardev/char-socket.c | 56 | --- qemu-6.2.0.orig/chardev/char-socket.c |
57 | +++ qemu-6.0.0/chardev/char-socket.c | 57 | +++ qemu-6.2.0/chardev/char-socket.c |
58 | @@ -1362,6 +1362,67 @@ static bool qmp_chardev_validate_socket( | 58 | @@ -1362,6 +1362,67 @@ static bool qmp_chardev_validate_socket( |
59 | return true; | 59 | return true; |
60 | } | 60 | } |
@@ -133,7 +133,7 @@ Index: qemu-6.0.0/chardev/char-socket.c | |||
133 | bool do_nodelay = sock->has_nodelay ? sock->nodelay : false; | 133 | bool do_nodelay = sock->has_nodelay ? sock->nodelay : false; |
134 | bool is_listen = sock->has_server ? sock->server : true; | 134 | bool is_listen = sock->has_server ? sock->server : true; |
135 | bool is_telnet = sock->has_telnet ? sock->telnet : false; | 135 | bool is_telnet = sock->has_telnet ? sock->telnet : false; |
136 | @@ -1446,6 +1510,14 @@ static void qmp_chardev_open_socket(Char | 136 | @@ -1440,6 +1504,14 @@ static void qmp_chardev_open_socket(Char |
137 | 137 | ||
138 | update_disconnected_filename(s); | 138 | update_disconnected_filename(s); |
139 | 139 | ||
@@ -148,7 +148,7 @@ Index: qemu-6.0.0/chardev/char-socket.c | |||
148 | if (s->is_listen) { | 148 | if (s->is_listen) { |
149 | if (qmp_chardev_open_socket_server(chr, is_telnet || is_tn3270, | 149 | if (qmp_chardev_open_socket_server(chr, is_telnet || is_tn3270, |
150 | is_waitconnect, errp) < 0) { | 150 | is_waitconnect, errp) < 0) { |
151 | @@ -1465,6 +1537,9 @@ static void qemu_chr_parse_socket(QemuOp | 151 | @@ -1459,6 +1531,9 @@ static void qemu_chr_parse_socket(QemuOp |
152 | const char *host = qemu_opt_get(opts, "host"); | 152 | const char *host = qemu_opt_get(opts, "host"); |
153 | const char *port = qemu_opt_get(opts, "port"); | 153 | const char *port = qemu_opt_get(opts, "port"); |
154 | const char *fd = qemu_opt_get(opts, "fd"); | 154 | const char *fd = qemu_opt_get(opts, "fd"); |
@@ -158,7 +158,7 @@ Index: qemu-6.0.0/chardev/char-socket.c | |||
158 | #ifdef CONFIG_LINUX | 158 | #ifdef CONFIG_LINUX |
159 | bool tight = qemu_opt_get_bool(opts, "tight", true); | 159 | bool tight = qemu_opt_get_bool(opts, "tight", true); |
160 | bool abstract = qemu_opt_get_bool(opts, "abstract", false); | 160 | bool abstract = qemu_opt_get_bool(opts, "abstract", false); |
161 | @@ -1472,6 +1547,20 @@ static void qemu_chr_parse_socket(QemuOp | 161 | @@ -1466,6 +1541,20 @@ static void qemu_chr_parse_socket(QemuOp |
162 | SocketAddressLegacy *addr; | 162 | SocketAddressLegacy *addr; |
163 | ChardevSocket *sock; | 163 | ChardevSocket *sock; |
164 | 164 | ||
@@ -179,7 +179,7 @@ Index: qemu-6.0.0/chardev/char-socket.c | |||
179 | if ((!!path + !!fd + !!host) != 1) { | 179 | if ((!!path + !!fd + !!host) != 1) { |
180 | error_setg(errp, | 180 | error_setg(errp, |
181 | "Exactly one of 'path', 'fd' or 'host' required"); | 181 | "Exactly one of 'path', 'fd' or 'host' required"); |
182 | @@ -1522,13 +1611,24 @@ static void qemu_chr_parse_socket(QemuOp | 182 | @@ -1516,13 +1605,24 @@ static void qemu_chr_parse_socket(QemuOp |
183 | sock->tls_creds = g_strdup(qemu_opt_get(opts, "tls-creds")); | 183 | sock->tls_creds = g_strdup(qemu_opt_get(opts, "tls-creds")); |
184 | sock->has_tls_authz = qemu_opt_get(opts, "tls-authz"); | 184 | sock->has_tls_authz = qemu_opt_get(opts, "tls-authz"); |
185 | sock->tls_authz = g_strdup(qemu_opt_get(opts, "tls-authz")); | 185 | sock->tls_authz = g_strdup(qemu_opt_get(opts, "tls-authz")); |
@@ -194,7 +194,7 @@ Index: qemu-6.0.0/chardev/char-socket.c | |||
194 | if (path) { | 194 | if (path) { |
195 | +#endif | 195 | +#endif |
196 | UnixSocketAddress *q_unix; | 196 | UnixSocketAddress *q_unix; |
197 | addr->type = SOCKET_ADDRESS_LEGACY_KIND_UNIX; | 197 | addr->type = SOCKET_ADDRESS_TYPE_UNIX; |
198 | q_unix = addr->u.q_unix.data = g_new0(UnixSocketAddress, 1); | 198 | q_unix = addr->u.q_unix.data = g_new0(UnixSocketAddress, 1); |
199 | +#ifndef _WIN32 | 199 | +#ifndef _WIN32 |
200 | + q_unix->path = cmd ? g_strdup_printf("cmd:%s", cmd) : g_strdup(path); | 200 | + q_unix->path = cmd ? g_strdup_printf("cmd:%s", cmd) : g_strdup(path); |
@@ -204,11 +204,11 @@ Index: qemu-6.0.0/chardev/char-socket.c | |||
204 | #ifdef CONFIG_LINUX | 204 | #ifdef CONFIG_LINUX |
205 | q_unix->has_tight = true; | 205 | q_unix->has_tight = true; |
206 | q_unix->tight = tight; | 206 | q_unix->tight = tight; |
207 | Index: qemu-6.0.0/chardev/char.c | 207 | Index: qemu-6.2.0/chardev/char.c |
208 | =================================================================== | 208 | =================================================================== |
209 | --- qemu-6.0.0.orig/chardev/char.c | 209 | --- qemu-6.2.0.orig/chardev/char.c |
210 | +++ qemu-6.0.0/chardev/char.c | 210 | +++ qemu-6.2.0/chardev/char.c |
211 | @@ -840,6 +840,9 @@ QemuOptsList qemu_chardev_opts = { | 211 | @@ -836,6 +836,9 @@ QemuOptsList qemu_chardev_opts = { |
212 | .name = "path", | 212 | .name = "path", |
213 | .type = QEMU_OPT_STRING, | 213 | .type = QEMU_OPT_STRING, |
214 | },{ | 214 | },{ |
@@ -218,10 +218,10 @@ Index: qemu-6.0.0/chardev/char.c | |||
218 | .name = "host", | 218 | .name = "host", |
219 | .type = QEMU_OPT_STRING, | 219 | .type = QEMU_OPT_STRING, |
220 | },{ | 220 | },{ |
221 | Index: qemu-6.0.0/qapi/char.json | 221 | Index: qemu-6.2.0/qapi/char.json |
222 | =================================================================== | 222 | =================================================================== |
223 | --- qemu-6.0.0.orig/qapi/char.json | 223 | --- qemu-6.2.0.orig/qapi/char.json |
224 | +++ qemu-6.0.0/qapi/char.json | 224 | +++ qemu-6.2.0/qapi/char.json |
225 | @@ -250,6 +250,10 @@ | 225 | @@ -250,6 +250,10 @@ |
226 | # | 226 | # |
227 | # @addr: socket address to listen on (server=true) | 227 | # @addr: socket address to listen on (server=true) |
diff --git a/meta/recipes-devtools/qemu/qemu_6.1.0.bb b/meta/recipes-devtools/qemu/qemu_6.2.0.bb index c9a53e3b05..c9a53e3b05 100644 --- a/meta/recipes-devtools/qemu/qemu_6.1.0.bb +++ b/meta/recipes-devtools/qemu/qemu_6.2.0.bb | |||