similarity index 99%
rename from meta/recipes-devtools/qemu/qemu-native_9.0.1.bb
rename to meta/recipes-devtools/qemu/qemu-native_9.0.2.bb
@@ -7,3 +7,4 @@ require qemu-native.inc
EXTRA_OECONF:append = " --target-list=${@get_qemu_usermode_target_list(d)} --disable-tools --disable-install-blobs --disable-guest-agent"
PACKAGECONFIG ??= "pie"
+
similarity index 99%
rename from meta/recipes-devtools/qemu/qemu-system-native_9.0.1.bb
rename to meta/recipes-devtools/qemu/qemu-system-native_9.0.2.bb
@@ -29,3 +29,4 @@ do_install:append() {
install -d ${D}${libdir}/qemu-python/qmp/
install -D ${S}/python/qemu/qmp/* ${D}${libdir}/qemu-python/qmp/
}
+
@@ -37,7 +37,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
"
UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
-SRC_URI[sha256sum] = "d0f4db0fbd151c0cf16f84aeb2a500f6e95009732546f44dafab8d2049bbb805"
+SRC_URI[sha256sum] = "a8c3f596aece96da3b00cafb74baafa0d14515eafb8ed1ee3f7f5c2d0ebf02b6"
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."
@@ -1,7 +1,7 @@
-From e9baf07a667a1c04b57e14776cc4fa387448c908 Mon Sep 17 00:00:00 2001
+From 07e236d558ba31fbc5abfdcaa83b8fa5f73fe135 Mon Sep 17 00:00:00 2001
From: Jason Wessel <jason.wessel@windriver.com>
Date: Fri, 28 Mar 2014 17:42:43 +0800
-Subject: [PATCH 01/11] qemu: Add addition environment space to boot loader
+Subject: [PATCH] qemu: Add addition environment space to boot loader
qemu-system-mips
Upstream-Status: Inappropriate - OE uses deep paths
@@ -18,7 +18,7 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/mips/malta.c b/hw/mips/malta.c
-index af74008c82..a588b9ad4e 100644
+index af74008c8..a588b9ad4 100644
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
@@ -63,7 +63,7 @@
@@ -30,6 +30,3 @@ index af74008c82..a588b9ad4e 100644
/* Hardware addresses */
#define FLASH_ADDRESS 0x1e000000ULL
-2.44.0
-
@@ -1,7 +1,7 @@
-From 23bf534e463bf4c1ba2e1356eaf17be0b23b192e Mon Sep 17 00:00:00 2001
+From 7877acf0ba9de83e82991394bdd92df0d241034a Mon Sep 17 00:00:00 2001
From: Mark Asselstine <mark.asselstine@windriver.com>
Date: Tue, 26 Feb 2013 11:43:28 -0500
-Subject: [PATCH 02/11] apic: fixup fallthrough to PIC
+Subject: [PATCH] apic: fixup fallthrough to PIC
Commit 0e21e12bb311c4c1095d0269dc2ef81196ccb60a [Don't route PIC
interrupts through the local APIC if the local APIC config says so.]
@@ -29,7 +29,7 @@ Signed-off-by: He Zhe <zhe.he@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/intc/apic.c b/hw/intc/apic.c
-index 4186c57b34..43cd805a96 100644
+index 4186c57b3..43cd805a9 100644
--- a/hw/intc/apic.c
+++ b/hw/intc/apic.c
@@ -759,7 +759,7 @@ int apic_accept_pic_intr(DeviceState *dev)
@@ -41,6 +41,3 @@ index 4186c57b34..43cd805a96 100644
return -1;
lvt0 = s->lvt[APIC_LVT_LINT0];
-2.44.0
-
@@ -1,7 +1,7 @@
-From e4f6c6b9f43b28271bc9dc6cbcafad53f80387e0 Mon Sep 17 00:00:00 2001
+From 97fb142009c4a7b76154f84470ea9eadaff49f13 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
+Subject: [PATCH] configure: Add pkg-config handling for libgcrypt
libgcrypt may also be controlled by pkg-config, this patch adds pkg-config
handling for libgcrypt.
@@ -14,7 +14,7 @@ Signed-off-by: He Zhe <zhe.he@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
-index 91a0aa64c6..e8373d55b8 100644
+index 91a0aa64c..e8373d55b 100644
--- a/meson.build
+++ b/meson.build
@@ -1655,7 +1655,7 @@ endif
@@ -26,6 +26,3 @@ index 91a0aa64c6..e8373d55b8 100644
required: get_option('gcrypt'))
# Debian has removed -lgpg-error from libgcrypt-config
# as it "spreads unnecessary dependencies" which in
-2.44.0
-
@@ -1,7 +1,7 @@
-From 5223d46a8d5302396f9fc7cc5d830769e87242fe Mon Sep 17 00:00:00 2001
+From 205244bb3022fa7f149085ed8c78b9c3623a3900 Mon Sep 17 00:00:00 2001
From: Oleksiy Obitotskyy <oobitots@cisco.com>
Date: Wed, 25 Mar 2020 21:21:35 +0200
-Subject: [PATCH 04/11] qemu: Do not include file if not exists
+Subject: [PATCH] qemu: Do not include file if not exists
Script configure checks for if_alg.h and check failed but
if_alg.h still included.
@@ -16,7 +16,7 @@ Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com>
1 file changed, 2 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 3df2b94d9a..18f09f1f07 100644
+index 2edbd1ef1..8b557f03a 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -116,7 +116,9 @@
@@ -29,6 +29,3 @@ index 3df2b94d9a..18f09f1f07 100644
#include <linux/rtc.h>
#include <sound/asound.h>
#ifdef HAVE_BTRFS_H
-2.44.0
-
@@ -1,8 +1,7 @@
-From 1c295069857b9850f15f2cd6b33b133ea641a454 Mon Sep 17 00:00:00 2001
+From 153e2a6e694e1c1d965b7c2bd2c9a5a80ec20419 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Fri, 8 Jan 2021 17:27:06 +0000
-Subject: [PATCH 05/11] qemu: Add some user space mmap tweaks to address musl
- 32 bit
+Subject: [PATCH] qemu: Add some user space mmap tweaks to address musl 32 bit
When using qemu-i386 to build qemux86 webkitgtk on musl, it sits in an
infinite loop of mremap calls of ever decreasing/increasing addresses.
@@ -23,7 +22,7 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/linux-user/mmap.c b/linux-user/mmap.c
-index be3b9a68eb..481286f01d 100644
+index be3b9a68e..481286f01 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -1060,12 +1060,16 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size,
@@ -46,6 +45,3 @@ index be3b9a68eb..481286f01d 100644
return -1;
}
-2.44.0
-
@@ -1,7 +1,7 @@
-From 9d32df80e33a7541658858497f45bed1e59e3621 Mon Sep 17 00:00:00 2001
+From 0a58fd302ecef63ec887de68391dd8dcc30ba3f0 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Mon, 1 Mar 2021 13:00:47 +0000
-Subject: [PATCH 06/11] qemu: Determinism fixes
+Subject: [PATCH] qemu: Determinism fixes
When sources are included within debug information, a couple of areas of the
qemu build are not reproducible due to either full buildpaths or timestamps.
@@ -16,7 +16,7 @@ RP 2021/3/1
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/decodetree.py b/scripts/decodetree.py
-index e8b72da3a9..5cd86b1428 100644
+index e8b72da3a..5cd86b142 100644
--- a/scripts/decodetree.py
+++ b/scripts/decodetree.py
@@ -1558,7 +1558,7 @@ def main():
@@ -28,6 +28,3 @@ index e8b72da3a9..5cd86b1428 100644
f = open(filename, 'rt', encoding='utf-8')
parse_file(f, toppat)
f.close()
-2.44.0
-
@@ -1,7 +1,7 @@
-From 77ebf67d0c96f51da91c8499200ebd13f4dcdd68 Mon Sep 17 00:00:00 2001
+From e57ca501e679f22030fedc04a636ce00843c0d4c Mon Sep 17 00:00:00 2001
From: Changqing Li <changqing.li@windriver.com>
Date: Thu, 14 Jan 2021 06:33:04 +0000
-Subject: [PATCH 07/11] tests/meson.build: use relative path to refer to files
+Subject: [PATCH] tests/meson.build: use relative path to refer to files
Fix error like:
Fatal error: can't create tests/ptimer-test.p/..._qemu-5.2.0_hw_core_ptimer.c.o: File name too long
@@ -17,7 +17,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/unit/meson.build b/tests/unit/meson.build
-index 228a21d03c..272fb4c6ca 100644
+index 228a21d03..272fb4c6c 100644
--- a/tests/unit/meson.build
+++ b/tests/unit/meson.build
@@ -47,7 +47,7 @@ tests = {
@@ -38,6 +38,3 @@ index 228a21d03c..272fb4c6ca 100644
'test-vmstate': [migration, io],
'test-yank': ['socket-helpers.c', qom, io, chardev]
}
-2.44.0
-
@@ -1,7 +1,7 @@
-From 21b159a11bbcb1eeb26f12456e4c3fd62a06cbec Mon Sep 17 00:00:00 2001
+From 7df2b38ad6f6cb01c3137dae3d08ed37de913e1d Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Mon, 21 Mar 2022 10:09:38 -0700
-Subject: [PATCH 08/11] Define MAP_SYNC and MAP_SHARED_VALIDATE on needed linux
+Subject: [PATCH] Define MAP_SYNC and MAP_SHARED_VALIDATE on needed linux
systems
linux only wires MAP_SYNC and MAP_SHARED_VALIDATE for architectures
@@ -18,7 +18,7 @@ Cc: Michael S. Tsirkin <mst@redhat.com>
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c
-index ed14f9c64d..038f5b4b55 100644
+index ed14f9c64..038f5b4b5 100644
--- a/util/mmap-alloc.c
+++ b/util/mmap-alloc.c
@@ -10,14 +10,18 @@
@@ -43,6 +43,3 @@ index ed14f9c64d..038f5b4b55 100644
#include "qemu/mmap-alloc.h"
#include "qemu/host-utils.h"
#include "qemu/cutils.h"
-2.44.0
-
@@ -1,8 +1,7 @@
-From 23de30079dbf47a8026faddd550a9e181d609c8f Mon Sep 17 00:00:00 2001
+From 0cf12c3cd003f2acc8c1cb765e62d5b68c48f5b2 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 17 Dec 2022 08:37:46 -0800
-Subject: [PATCH 09/11] linux-user: Replace use of lfs64 related functions and
- macros
+Subject: [PATCH] linux-user: Replace use of lfs64 related functions and macros
Builds defines -D_FILE_OFFSET_BITS=64 which makes the original functions
anf macros behave same as their 64 suffixed counterparts. This also
@@ -17,7 +16,7 @@ Cc: Laurent Vivier <laurent@vivier.eu>
1 file changed, 39 insertions(+), 114 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index 18f09f1f07..1b7c50a2a7 100644
+index 8b557f03a..cb5097c88 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -761,8 +761,8 @@ safe_syscall6(ssize_t, copy_file_range, int, infd, loff_t *, pinoff,
@@ -31,7 +30,7 @@ index 18f09f1f07..1b7c50a2a7 100644
* This will then work and use a 64-bit offset for both 32-bit and 64-bit hosts.
*/
#ifdef __NR_fcntl64
-@@ -6739,13 +6739,13 @@ static int target_to_host_fcntl_cmd(int cmd)
+@@ -6734,13 +6734,13 @@ static int target_to_host_fcntl_cmd(int cmd)
ret = cmd;
break;
case TARGET_F_GETLK:
@@ -48,7 +47,7 @@ index 18f09f1f07..1b7c50a2a7 100644
break;
case TARGET_F_GETOWN:
ret = F_GETOWN;
-@@ -6759,17 +6759,6 @@ static int target_to_host_fcntl_cmd(int cmd)
+@@ -6754,17 +6754,6 @@ static int target_to_host_fcntl_cmd(int cmd)
case TARGET_F_SETSIG:
ret = F_SETSIG;
break;
@@ -66,7 +65,7 @@ index 18f09f1f07..1b7c50a2a7 100644
case TARGET_F_SETLEASE:
ret = F_SETLEASE;
break;
-@@ -6821,8 +6810,8 @@ static int target_to_host_fcntl_cmd(int cmd)
+@@ -6816,8 +6805,8 @@ static int target_to_host_fcntl_cmd(int cmd)
* them to 5, 6 and 7 before making the syscall(). Since we make the
* syscall directly, adjust to what is supported by the kernel.
*/
@@ -77,7 +76,7 @@ index 18f09f1f07..1b7c50a2a7 100644
}
#endif
-@@ -6855,55 +6844,11 @@ static int host_to_target_flock(int type)
+@@ -6850,55 +6839,11 @@ static int host_to_target_flock(int type)
return type;
}
@@ -136,7 +135,7 @@ index 18f09f1f07..1b7c50a2a7 100644
abi_short l_type;
abi_short l_whence;
abi_llong l_start;
-@@ -6911,10 +6856,10 @@ struct target_oabi_flock64 {
+@@ -6906,10 +6851,10 @@ struct target_oabi_flock64 {
abi_int l_pid;
} QEMU_PACKED;
@@ -149,7 +148,7 @@ index 18f09f1f07..1b7c50a2a7 100644
int l_type;
if (!lock_user_struct(VERIFY_READ, target_fl, target_flock_addr, 1)) {
-@@ -6935,10 +6880,10 @@ static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl,
+@@ -6930,10 +6875,10 @@ static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl,
return 0;
}
@@ -163,7 +162,7 @@ index 18f09f1f07..1b7c50a2a7 100644
short l_type;
if (!lock_user_struct(VERIFY_WRITE, target_fl, target_flock_addr, 0)) {
-@@ -6956,10 +6901,10 @@ static inline abi_long copy_to_user_oabi_flock64(abi_ulong target_flock_addr,
+@@ -6951,10 +6896,10 @@ static inline abi_long copy_to_user_oabi_flock64(abi_ulong target_flock_addr,
}
#endif
@@ -176,7 +175,7 @@ index 18f09f1f07..1b7c50a2a7 100644
int l_type;
if (!lock_user_struct(VERIFY_READ, target_fl, target_flock_addr, 1)) {
-@@ -6980,10 +6925,10 @@ static inline abi_long copy_from_user_flock64(struct flock64 *fl,
+@@ -6975,10 +6920,10 @@ static inline abi_long copy_from_user_flock64(struct flock64 *fl,
return 0;
}
@@ -190,7 +189,7 @@ index 18f09f1f07..1b7c50a2a7 100644
short l_type;
if (!lock_user_struct(VERIFY_WRITE, target_fl, target_flock_addr, 0)) {
-@@ -7002,7 +6947,7 @@ static inline abi_long copy_to_user_flock64(abi_ulong target_flock_addr,
+@@ -6997,7 +6942,7 @@ static inline abi_long copy_to_user_flock64(abi_ulong target_flock_addr,
static abi_long do_fcntl(int fd, int cmd, abi_ulong arg)
{
@@ -199,7 +198,7 @@ index 18f09f1f07..1b7c50a2a7 100644
#ifdef F_GETOWN_EX
struct f_owner_ex fox;
struct target_f_owner_ex *target_fox;
-@@ -7015,6 +6960,7 @@ static abi_long do_fcntl(int fd, int cmd, abi_ulong arg)
+@@ -7010,6 +6955,7 @@ static abi_long do_fcntl(int fd, int cmd, abi_ulong arg)
switch(cmd) {
case TARGET_F_GETLK:
@@ -207,7 +206,7 @@ index 18f09f1f07..1b7c50a2a7 100644
ret = copy_from_user_flock(&fl64, arg);
if (ret) {
return ret;
-@@ -7024,32 +6970,11 @@ static abi_long do_fcntl(int fd, int cmd, abi_ulong arg)
+@@ -7019,32 +6965,11 @@ static abi_long do_fcntl(int fd, int cmd, abi_ulong arg)
ret = copy_to_user_flock(arg, &fl64);
}
break;
@@ -241,7 +240,7 @@ index 18f09f1f07..1b7c50a2a7 100644
if (ret) {
return ret;
}
-@@ -7278,7 +7203,7 @@ static inline abi_long target_truncate64(CPUArchState *cpu_env, const char *arg1
+@@ -7279,7 +7204,7 @@ static inline abi_long target_truncate64(CPUArchState *cpu_env, const char *arg1
arg2 = arg3;
arg3 = arg4;
}
@@ -250,7 +249,7 @@ index 18f09f1f07..1b7c50a2a7 100644
}
#endif
-@@ -7292,7 +7217,7 @@ static inline abi_long target_ftruncate64(CPUArchState *cpu_env, abi_long arg1,
+@@ -7293,7 +7218,7 @@ static inline abi_long target_ftruncate64(CPUArchState *cpu_env, abi_long arg1,
arg2 = arg3;
arg3 = arg4;
}
@@ -259,7 +258,7 @@ index 18f09f1f07..1b7c50a2a7 100644
}
#endif
-@@ -8667,7 +8592,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count)
+@@ -8668,7 +8593,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count)
void *tdirp;
int hlen, hoff, toff;
int hreclen, treclen;
@@ -268,7 +267,7 @@ index 18f09f1f07..1b7c50a2a7 100644
hdirp = g_try_malloc(count);
if (!hdirp) {
-@@ -8720,7 +8645,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count)
+@@ -8721,7 +8646,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count)
* Return what we have, resetting the file pointer to the
* location of the first record not returned.
*/
@@ -277,7 +276,7 @@ index 18f09f1f07..1b7c50a2a7 100644
break;
}
-@@ -8754,7 +8679,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count)
+@@ -8755,7 +8680,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count)
void *tdirp;
int hlen, hoff, toff;
int hreclen, treclen;
@@ -286,7 +285,7 @@ index 18f09f1f07..1b7c50a2a7 100644
hdirp = g_try_malloc(count);
if (!hdirp) {
-@@ -8796,7 +8721,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count)
+@@ -8797,7 +8722,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count)
* Return what we have, resetting the file pointer to the
* location of the first record not returned.
*/
@@ -295,7 +294,7 @@ index 18f09f1f07..1b7c50a2a7 100644
break;
}
-@@ -11527,7 +11452,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
+@@ -11528,7 +11453,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
return -TARGET_EFAULT;
}
}
@@ -304,7 +303,7 @@ index 18f09f1f07..1b7c50a2a7 100644
unlock_user(p, arg2, ret);
return ret;
case TARGET_NR_pwrite64:
-@@ -11544,7 +11469,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
+@@ -11545,7 +11470,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
return -TARGET_EFAULT;
}
}
@@ -313,7 +312,7 @@ index 18f09f1f07..1b7c50a2a7 100644
unlock_user(p, arg2, 0);
return ret;
#endif
-@@ -12404,14 +12329,14 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
+@@ -12405,14 +12330,14 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
case TARGET_NR_fcntl64:
{
int cmd;
@@ -333,7 +332,7 @@ index 18f09f1f07..1b7c50a2a7 100644
}
#endif
-@@ -12421,7 +12346,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
+@@ -12422,7 +12347,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
}
switch(arg2) {
@@ -342,7 +341,7 @@ index 18f09f1f07..1b7c50a2a7 100644
ret = copyfrom(&fl, arg3);
if (ret) {
break;
-@@ -12432,8 +12357,8 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
+@@ -12433,8 +12358,8 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1,
}
break;
@@ -353,6 +352,3 @@ index 18f09f1f07..1b7c50a2a7 100644
ret = copyfrom(&fl, arg3);
if (ret) {
break;
-2.44.0
-
@@ -1,7 +1,7 @@
-From e12a93174f9b652604dda8d8464b9559b62b29d5 Mon Sep 17 00:00:00 2001
+From a75d0412567947ca7c794b5c59f81341c7e5045e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <martin@geanix.com>
Date: Wed, 22 May 2024 14:02:55 +0200
-Subject: [PATCH 10/11] configure: lookup meson exutable from PATH
+Subject: [PATCH] configure: lookup meson exutable from PATH
Upstream-Status: Inappropriate [workaround, would need a real fix for upstream]
---
@@ -9,10 +9,10 @@ Upstream-Status: Inappropriate [workaround, would need a real fix for upstream]
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/configure b/configure
-index 3cd736b139..482a1f8ef3 100755
+index 0aea9b113..c28bd47b4 100755
--- a/configure
+++ b/configure
-@@ -956,12 +956,7 @@ fi
+@@ -965,12 +965,7 @@ fi
$mkvenv ensuregroup --dir "${source_path}/python/wheels" \
${source_path}/pythondeps.toml meson || exit 1
@@ -26,6 +26,3 @@ index 3cd736b139..482a1f8ef3 100755
# Conditionally ensure Sphinx is installed.
-2.44.0
-
@@ -1,8 +1,7 @@
-From a93c2a6b2c9db9c4bd30298da43c37c5e5c6236e Mon Sep 17 00:00:00 2001
+From 756a5c1efc91f113e7f6edcb0810440cbad41345 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 22 May 2024 13:58:23 +0200
-Subject: [PATCH 11/11] qemu: Ensure pip and the python venv aren't used for
- meson
+Subject: [PATCH] qemu: Ensure pip and the python venv aren't used for meson
Qemu wants to use a supported python version and a specific meson version
to "help" users and uses pip and creates a venv to do this. This is a nightmare
@@ -30,10 +29,10 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
-index 482a1f8ef3..0da4bf3e4d 100755
+index c28bd47b4..33b89b236 100755
--- a/configure
+++ b/configure
-@@ -938,14 +938,14 @@ python="$(command -v "$python")"
+@@ -947,14 +947,14 @@ python="$(command -v "$python")"
echo "python determined to be '$python'"
echo "python version: $($python --version)"
@@ -50,6 +49,3 @@ index 482a1f8ef3..0da4bf3e4d 100755
# Finish preparing the virtual environment using vendored .whl files
-2.44.0
-
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu_9.0.1.bb
rename to meta/recipes-devtools/qemu/qemu_9.0.2.bb
Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe(s) *qemu,qemu-native,qemu-system-native* to *9.0.2,9.0.2,9.0.2* has Succeeded. Next steps: - apply the patch: git am 0001-qemu-qemu-native-qemu-system-native-upgrade-9.0.1-9..patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 56bf662f5ea2e713eb4e7931a5bb4f2ee782f224 Mon Sep 17 00:00:00 2001 From: Upgrade Helper <auh@yoctoproject.org> Date: Thu, 1 Aug 2024 06:49:39 +0000 Subject: [PATCH] qemu,qemu-native,qemu-system-native: upgrade 9.0.1 -> 9.0.2,9.0.1 -> 9.0.2,9.0.1 -> 9.0.2 --- ...u-native_9.0.1.bb => qemu-native_9.0.2.bb} | 1 + ...e_9.0.1.bb => qemu-system-native_9.0.2.bb} | 1 + meta/recipes-devtools/qemu/qemu.inc | 2 +- ...n-environment-space-to-boot-loader-q.patch | 9 ++-- .../0002-apic-fixup-fallthrough-to-PIC.patch | 9 ++-- ...dd-pkg-config-handling-for-libgcrypt.patch | 9 ++-- ...mu-Do-not-include-file-if-not-exists.patch | 9 ++-- ...er-space-mmap-tweaks-to-address-musl.patch | 10 ++-- .../qemu/0006-qemu-Determinism-fixes.patch | 9 ++-- ...d-use-relative-path-to-refer-to-file.patch | 9 ++-- ...and-MAP_SHARED_VALIDATE-on-needed-li.patch | 9 ++-- ...ce-use-of-lfs64-related-functions-an.patch | 54 +++++++++---------- ...gure-lookup-meson-exutable-from-PATH.patch | 11 ++-- ...and-the-python-venv-aren-t-used-for-.patch | 12 ++--- .../qemu/{qemu_9.0.1.bb => qemu_9.0.2.bb} | 0 15 files changed, 60 insertions(+), 94 deletions(-) rename meta/recipes-devtools/qemu/{qemu-native_9.0.1.bb => qemu-native_9.0.2.bb} (99%) rename meta/recipes-devtools/qemu/{qemu-system-native_9.0.1.bb => qemu-system-native_9.0.2.bb} (99%) rename meta/recipes-devtools/qemu/{qemu_9.0.1.bb => qemu_9.0.2.bb} (100%)