From: Quan Sun <[email protected]>
Signed-off-by: Quan Sun <[email protected]>
---
...native_10.2.0.bb => qemu-native_11.0.0.bb} | 0
...10.2.0.bb => qemu-system-native_11.0.0.bb} | 4 +-
meta/recipes-devtools/qemu/qemu.inc | 7 ++-
...load.c-Correction-to-HWCAP2-accessor.patch | 42 ---------------
...n-environment-space-to-boot-loader-q.patch | 6 +--
.../0002-apic-fixup-fallthrough-to-PIC.patch | 6 +--
...mu-Do-not-include-file-if-not-exists.patch | 6 +--
...er-space-mmap-tweaks-to-address-musl.patch | 22 +++-----
.../qemu/0006-qemu-Determinism-fixes.patch | 2 +-
...d-use-relative-path-to-refer-to-file.patch | 6 +--
...and-MAP_SHARED_VALIDATE-on-needed-li.patch | 2 +-
...gure-lookup-meson-exutable-from-PATH.patch | 10 ++--
...ject-include-paths-for-standalone-bu.patch | 52 +++++++++++++++++++
...and-the-python-venv-aren-t-used-for-.patch | 10 ++--
.../qemu/qemu/fix-strerrorname_np.patch | 35 -------------
.../qemu/{qemu_10.2.0.bb => qemu_11.0.0.bb} | 0
16 files changed, 87 insertions(+), 123 deletions(-)
rename meta/recipes-devtools/qemu/{qemu-native_10.2.0.bb =>
qemu-native_11.0.0.bb} (100%)
rename meta/recipes-devtools/qemu/{qemu-system-native_10.2.0.bb =>
qemu-system-native_11.0.0.bb} (86%)
delete mode 100644
meta/recipes-devtools/qemu/qemu/0001-linux-user-elfload.c-Correction-to-HWCAP2-accessor.patch
create mode 100644
meta/recipes-devtools/qemu/qemu/0010-meson-fix-subproject-include-paths-for-standalone-bu.patch
delete mode 100644 meta/recipes-devtools/qemu/qemu/fix-strerrorname_np.patch
rename meta/recipes-devtools/qemu/{qemu_10.2.0.bb => qemu_11.0.0.bb} (100%)
diff --git a/meta/recipes-devtools/qemu/qemu-native_10.2.0.bb
b/meta/recipes-devtools/qemu/qemu-native_11.0.0.bb
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-native_10.2.0.bb
rename to meta/recipes-devtools/qemu/qemu-native_11.0.0.bb
diff --git a/meta/recipes-devtools/qemu/qemu-system-native_10.2.0.bb
b/meta/recipes-devtools/qemu/qemu-system-native_11.0.0.bb
similarity index 86%
rename from meta/recipes-devtools/qemu/qemu-system-native_10.2.0.bb
rename to meta/recipes-devtools/qemu/qemu-system-native_11.0.0.bb
index 2e4f7328ad..506559a09b 100644
--- a/meta/recipes-devtools/qemu/qemu-system-native_10.2.0.bb
+++ b/meta/recipes-devtools/qemu/qemu-system-native_11.0.0.bb
@@ -26,8 +26,6 @@ do_install:append() {
rm -rf ${D}${datadir}/icons/
rm -rf ${D}${includedir}/qemu-plugin.h
- # Install qmp.py to be used with testimage
- install -d ${D}${libdir}/qemu-python/qmp/
- install -D ${S}/python/qemu/qmp/* ${D}${libdir}/qemu-python/qmp/
+ # The qemu.qmp library from the main QEMU repository has now been removed.
}
diff --git a/meta/recipes-devtools/qemu/qemu.inc
b/meta/recipes-devtools/qemu/qemu.inc
index 7aa593bc5d..5cadbaa03e 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -22,7 +22,6 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=a3b50d8b88dcc0eb3d7d39b760b9e821 \
SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
file://powerpc_rom.bin \
file://run-ptest \
- 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://0004-qemu-Do-not-include-file-if-not-exists.patch \
@@ -32,15 +31,15 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
file://0008-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch \
file://0010-configure-lookup-meson-exutable-from-PATH.patch \
file://0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch \
-
file://0001-linux-user-elfload.c-Correction-to-HWCAP2-accessor.patch \
file://qemu-guest-agent.init \
file://qemu-guest-agent.udev \
+
file://0010-meson-fix-subproject-include-paths-for-standalone-bu.patch \
"
# file index at download.qemu.org isn't reliable:
https://gitlab.com/qemu-project/qemu-web/-/issues/9
UPSTREAM_CHECK_URI = "https://www.qemu.org";
UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
-SRC_URI[sha256sum] =
"9e30ad1b8b9f7b4463001582d1ab297f39cfccea5d08540c0ca6d6672785883a"
+SRC_URI[sha256sum] =
"c04ca36012653f32d11c674d370cf52a710e7d3f18c2d8b63e4932052a4854d6"
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."
@@ -74,7 +73,7 @@ do_install_ptest() {
find ${D}${PTEST_PATH}/tests -type f -name "*.[Sshcodp]" | xargs -i rm
-rf {}
# Don't check the file genreated by configure
- sed -i -e "1s,#!/usr/bin/bash,#!${base_bindir}/bash,"
${D}${PTEST_PATH}/tests/data/acpi/disassemle-aml.sh
+ sed -i -e "1s,#!/usr/bin/bash,#!${base_bindir}/bash,"
${D}${PTEST_PATH}/tests/data/acpi/disassemble-aml.sh
# Strip the paths from the QEMU variable, we can use PATH
makfiles=$(find ${D}${PTEST_PATH} -name "*.mak")
diff --git
a/meta/recipes-devtools/qemu/qemu/0001-linux-user-elfload.c-Correction-to-HWCAP2-accessor.patch
b/meta/recipes-devtools/qemu/qemu/0001-linux-user-elfload.c-Correction-to-HWCAP2-accessor.patch
deleted file mode 100644
index 47d6f41385..0000000000
---
a/meta/recipes-devtools/qemu/qemu/0001-linux-user-elfload.c-Correction-to-HWCAP2-accessor.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From c333f9c4ee212297f3b9a8a6ef62396a63c48e61 Mon Sep 17 00:00:00 2001
-From: Jim MacArthur <[email protected]>
-Date: Tue, 6 Jan 2026 15:40:48 +0000
-Subject: [PATCH] linux-user/elfload.c: Correction to HWCAP2 accessor
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-get_elf_hwcap was used when get_elf_hwcap2 should have been.
-
-Cc: [email protected]
-Fixes: fcac98d0ba8b ("linux-user: Remove ELF_HWCAP2")
-Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3259
-Signed-off-by: Jim MacArthur <[email protected]>
-Reviewed-by: Richard Henderson <[email protected]>
-Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
-Signed-off-by: Richard Henderson <[email protected]>
-Message-ID: <[email protected]>
-
-Upstream-Status: Backport
[https://gitlab.com/qemu-project/qemu/-/commit/c333f9c4ee212297f3b9a8a6ef62396a63c48e61]
-
-Signed-off-by: Chen Qi <[email protected]>
----
- linux-user/elfload.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/linux-user/elfload.c b/linux-user/elfload.c
-index 0002d5be2f..35471c0c9a 100644
---- a/linux-user/elfload.c
-+++ b/linux-user/elfload.c
-@@ -708,7 +708,7 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc,
int envc,
- NEW_AUX_ENT(AT_EXECFN, info->file_string);
-
- if (HAVE_ELF_HWCAP2) {
-- NEW_AUX_ENT(AT_HWCAP2, get_elf_hwcap(thread_cpu));
-+ NEW_AUX_ENT(AT_HWCAP2, get_elf_hwcap2(thread_cpu));
- }
- if (u_base_platform) {
- NEW_AUX_ENT(AT_BASE_PLATFORM, u_base_platform);
---
-2.34.1
-
diff --git
a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch
b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch
index bc8dace013..98aa6b6387 100644
---
a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch
+++
b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch
@@ -1,4 +1,4 @@
-From f2d9bc614f7edf66412209aba78aa086e65dc75e Mon Sep 17 00:00:00 2001
+From a84184c98cf296954e0c757604e969b8565eb474 Mon Sep 17 00:00:00 2001
From: Jason Wessel <[email protected]>
Date: Fri, 28 Mar 2014 17:42:43 +0800
Subject: [PATCH] qemu: Add addition environment space to boot loader
@@ -18,10 +18,10 @@ Signed-off-by: Roy Li <[email protected]>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/mips/malta.c b/hw/mips/malta.c
-index cbdbb2105..62681fdae 100644
+index 812ff64d8..daf929943 100644
--- a/hw/mips/malta.c
+++ b/hw/mips/malta.c
-@@ -65,7 +65,7 @@
+@@ -66,7 +66,7 @@
#define ENVP_PADDR 0x2000
#define ENVP_VADDR cpu_mips_phys_to_kseg0(NULL, ENVP_PADDR)
#define ENVP_NB_ENTRIES 16
diff --git
a/meta/recipes-devtools/qemu/qemu/0002-apic-fixup-fallthrough-to-PIC.patch
b/meta/recipes-devtools/qemu/qemu/0002-apic-fixup-fallthrough-to-PIC.patch
index bfc85f4842..ad00f24482 100644
--- a/meta/recipes-devtools/qemu/qemu/0002-apic-fixup-fallthrough-to-PIC.patch
+++ b/meta/recipes-devtools/qemu/qemu/0002-apic-fixup-fallthrough-to-PIC.patch
@@ -1,4 +1,4 @@
-From 945af9ecc80653955cbdbb7d3e28dce61795b251 Mon Sep 17 00:00:00 2001
+From 0a688e763d91c2e0e11cbe960f405442a9f35417 Mon Sep 17 00:00:00 2001
From: Mark Asselstine <[email protected]>
Date: Tue, 26 Feb 2013 11:43:28 -0500
Subject: [PATCH] apic: fixup fallthrough to PIC
@@ -33,10 +33,10 @@ Signed-off-by: Kai Kang <[email protected]>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/intc/apic.c b/hw/intc/apic.c
-index aad253a..212b01f 100644
+index 8766ed00b..581fc6deb 100644
--- a/hw/intc/apic.c
+++ b/hw/intc/apic.c
-@@ -740,7 +740,7 @@ int apic_accept_pic_intr(APICCommonState *s)
+@@ -741,7 +741,7 @@ int apic_accept_pic_intr(APICCommonState *s)
{
uint32_t lvt0;
diff --git
a/meta/recipes-devtools/qemu/qemu/0004-qemu-Do-not-include-file-if-not-exists.patch
b/meta/recipes-devtools/qemu/qemu/0004-qemu-Do-not-include-file-if-not-exists.patch
index 2e738abaa3..4b6ac54445 100644
---
a/meta/recipes-devtools/qemu/qemu/0004-qemu-Do-not-include-file-if-not-exists.patch
+++
b/meta/recipes-devtools/qemu/qemu/0004-qemu-Do-not-include-file-if-not-exists.patch
@@ -1,4 +1,4 @@
-From f8c1614b204c1d64af906dc70dbf4a1534eb6b38 Mon Sep 17 00:00:00 2001
+From b38315a5a6f9fc033c72bb94ff258bb4b1ac8dd3 Mon Sep 17 00:00:00 2001
From: Oleksiy Obitotskyy <[email protected]>
Date: Wed, 25 Mar 2020 21:21:35 +0200
Subject: [PATCH] qemu: Do not include file if not exists
@@ -16,10 +16,10 @@ Signed-off-by: Sakib Sajal <[email protected]>
1 file changed, 2 insertions(+)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index c236b2834..2a3527a87 100644
+index f4b74ad35..3da51ea83 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
-@@ -119,7 +119,9 @@
+@@ -117,7 +117,9 @@
#include <linux/blkpg.h>
#include <netpacket/packet.h>
#include <linux/netlink.h>
diff --git
a/meta/recipes-devtools/qemu/qemu/0005-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch
b/meta/recipes-devtools/qemu/qemu/0005-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch
index ffbbb1ab32..f270c6a035 100644
---
a/meta/recipes-devtools/qemu/qemu/0005-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch
+++
b/meta/recipes-devtools/qemu/qemu/0005-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch
@@ -1,4 +1,4 @@
-From 3621615790270449bf9c8a0777e8ef28eb762bf9 Mon Sep 17 00:00:00 2001
+From e4abb937ba5a6a476d31886e71e67006df22a664 Mon Sep 17 00:00:00 2001
From: Richard Purdie <[email protected]>
Date: Fri, 8 Jan 2021 17:27:06 +0000
Subject: [PATCH] qemu: Add some user space mmap tweaks to address musl 32 bit
@@ -18,30 +18,22 @@ rather than ENOMEM so adjust the other part of the test to
this.
Upstream-Status: Submitted
[https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg01355.html]
Signed-off-by: Richard Purdie <[email protected]
---
- linux-user/mmap.c | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
+ linux-user/mmap.c | 5 +++++
+ 1 file changed, 5 insertions(+)
diff --git a/linux-user/mmap.c b/linux-user/mmap.c
-index 002e1e668..912839dec 100644
+index b635b6a21..a5a617516 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
-@@ -1109,12 +1109,16 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong
old_size,
+@@ -1113,6 +1113,11 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong
old_size,
int prot;
void *host_addr;
-- if (!guest_range_valid_untagged(old_addr, old_size) ||
-- ((flags & MREMAP_FIXED) &&
+ if (!guest_range_valid_untagged(old_addr, old_size)) {
+ errno = EFAULT;
+ return -1;
+ }
-+
-+ if (((flags & MREMAP_FIXED) &&
++
+ if (((flags & MREMAP_FIXED) &&
!guest_range_valid_untagged(new_addr, new_size)) ||
((flags & MREMAP_MAYMOVE) == 0 &&
- !guest_range_valid_untagged(old_addr, new_size))) {
-- errno = ENOMEM;
-+ errno = EINVAL;
- return -1;
- }
-
diff --git a/meta/recipes-devtools/qemu/qemu/0006-qemu-Determinism-fixes.patch
b/meta/recipes-devtools/qemu/qemu/0006-qemu-Determinism-fixes.patch
index 5b24c18916..b54149cb8a 100644
--- a/meta/recipes-devtools/qemu/qemu/0006-qemu-Determinism-fixes.patch
+++ b/meta/recipes-devtools/qemu/qemu/0006-qemu-Determinism-fixes.patch
@@ -1,4 +1,4 @@
-From 8b28a9376074067bc2d84d4f77d5c7a42433b31b Mon Sep 17 00:00:00 2001
+From e891928d2248e186c65979cf5a2ba0cff9d00824 Mon Sep 17 00:00:00 2001
From: Richard Purdie <[email protected]>
Date: Mon, 1 Mar 2021 13:00:47 +0000
Subject: [PATCH] qemu: Determinism fixes
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 a58c936d06..275c500894 100644
---
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
@@ -1,4 +1,4 @@
-From 097b75ad8310143decab92f6d1744144e7a4809f Mon Sep 17 00:00:00 2001
+From ac9a866ac807cb1542f26df07b4aad3a06342a99 Mon Sep 17 00:00:00 2001
From: Changqing Li <[email protected]>
Date: Thu, 14 Jan 2021 06:33:04 +0000
Subject: [PATCH] tests/meson.build: use relative path to refer to files
@@ -17,10 +17,10 @@ Signed-off-by: Changqing Li <[email protected]>
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/unit/meson.build b/tests/unit/meson.build
-index d5248ae51..2c581f055 100644
+index 41e8b06c3..ce5df4957 100644
--- a/tests/unit/meson.build
+++ b/tests/unit/meson.build
-@@ -127,17 +127,17 @@ endif
+@@ -124,17 +124,17 @@ endif
if have_system
tests += {
diff --git
a/meta/recipes-devtools/qemu/qemu/0008-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch
b/meta/recipes-devtools/qemu/qemu/0008-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch
index af0eafb65f..f6e563ad80 100644
---
a/meta/recipes-devtools/qemu/qemu/0008-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch
+++
b/meta/recipes-devtools/qemu/qemu/0008-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch
@@ -1,4 +1,4 @@
-From 9d5deb767523ea0d1aeecb9960244c702530acad Mon Sep 17 00:00:00 2001
+From c0bfd2c5556afcf4413c81b3fda54a62f2bdd8c8 Mon Sep 17 00:00:00 2001
From: Khem Raj <[email protected]>
Date: Mon, 21 Mar 2022 10:09:38 -0700
Subject: [PATCH] Define MAP_SYNC and MAP_SHARED_VALIDATE on needed linux
diff --git
a/meta/recipes-devtools/qemu/qemu/0010-configure-lookup-meson-exutable-from-PATH.patch
b/meta/recipes-devtools/qemu/qemu/0010-configure-lookup-meson-exutable-from-PATH.patch
index db88766cf6..430b1aa509 100644
---
a/meta/recipes-devtools/qemu/qemu/0010-configure-lookup-meson-exutable-from-PATH.patch
+++
b/meta/recipes-devtools/qemu/qemu/0010-configure-lookup-meson-exutable-from-PATH.patch
@@ -1,4 +1,4 @@
-From aaec67c133dddda7204d23964732b4b788cbc9ce Mon Sep 17 00:00:00 2001
+From e357ac91b04f733148defe8c133ae8b2085a9a23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= <[email protected]>
Date: Wed, 22 May 2024 14:02:55 +0200
Subject: [PATCH] configure: lookup meson exutable from PATH
@@ -13,10 +13,10 @@ Signed-off-by: Kai Kang <[email protected]>
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/configure b/configure
-index 82cace1..83bbda9 100755
+index eea903067..217af781f 100755
--- a/configure
+++ b/configure
-@@ -993,10 +993,7 @@ get_pwd() {
+@@ -981,10 +981,7 @@ get_pwd() {
fi
}
@@ -26,5 +26,5 @@ index 82cace1..83bbda9 100755
-fi
+meson=`which meson`
- # Conditionally ensure Sphinx is installed.
-
+ # On Haiku, meson might show up in a "non-packaged" subfolder instead, see
+ #
https://github.com/haiku/haiku/blob/r1beta5/docs/user/storage/storageintro.dox
diff --git
a/meta/recipes-devtools/qemu/qemu/0010-meson-fix-subproject-include-paths-for-standalone-bu.patch
b/meta/recipes-devtools/qemu/qemu/0010-meson-fix-subproject-include-paths-for-standalone-bu.patch
new file mode 100644
index 0000000000..b7d31f0ed7
--- /dev/null
+++
b/meta/recipes-devtools/qemu/qemu/0010-meson-fix-subproject-include-paths-for-standalone-bu.patch
@@ -0,0 +1,52 @@
+From f013e84d382bc1bd7d49206bdf47c689b0c6fbb5 Mon Sep 17 00:00:00 2001
+From: Quan Sun <[email protected]>
+Date: Fri, 1 May 2026 13:53:24 -0700
+Subject: [PATCH] meson: fix subproject include paths for standalone builds
+
+Upstream-Status: Pending
+
+---
+ subprojects/libvduse/meson.build | 3 ++-
+ subprojects/libvhost-user/meson.build | 9 ++++++---
+ 2 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/subprojects/libvduse/meson.build
b/subprojects/libvduse/meson.build
+index 3e3b53da3..80114f431 100644
+--- a/subprojects/libvduse/meson.build
++++ b/subprojects/libvduse/meson.build
+@@ -10,7 +10,8 @@
add_project_arguments(cc.get_supported_arguments('-Wsign-compare',
+
+ libvduse = static_library('vduse',
+ files('libvduse.c'),
+- c_args: '-D_GNU_SOURCE')
++ c_args: '-D_GNU_SOURCE',
++ include_directories: include_directories('.',
'../..', '../../include'))
+
+ libvduse_dep = declare_dependency(link_with: libvduse,
+ include_directories:
include_directories('.'))
+diff --git a/subprojects/libvhost-user/meson.build
b/subprojects/libvhost-user/meson.build
+index a18014e7f..6d469038c 100644
+--- a/subprojects/libvhost-user/meson.build
++++ b/subprojects/libvhost-user/meson.build
+@@ -14,15 +14,18 @@ glib = dependency('glib-2.0')
+ vhost_user = static_library('vhost-user',
+ files('libvhost-user.c'),
+ dependencies: threads,
+- c_args: '-D_GNU_SOURCE')
++ c_args: '-D_GNU_SOURCE',
++ include_directories: include_directories('.',
'../..', '../../include'))
+
+ executable('link-test', files('link-test.c'),
+- link_whole: vhost_user)
++ link_whole: vhost_user,
++ include_directories: include_directories('.', '../..',
'../../include'))
+
+ vhost_user_glib = static_library('vhost-user-glib',
+ files('libvhost-user-glib.c'),
+ link_with: vhost_user,
+- dependencies: glib)
++ dependencies: glib,
++ include_directories:
include_directories('.', '../..', '../../include'))
+
+ vhost_user_dep = declare_dependency(link_with: vhost_user_glib,
+ dependencies: glib,
diff --git
a/meta/recipes-devtools/qemu/qemu/0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch
b/meta/recipes-devtools/qemu/qemu/0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch
index d04596d313..040931a941 100644
---
a/meta/recipes-devtools/qemu/qemu/0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch
+++
b/meta/recipes-devtools/qemu/qemu/0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch
@@ -1,4 +1,4 @@
-From c9f174b2f7b43e59e91f88c75c8b3e2ee30bfcdd Mon Sep 17 00:00:00 2001
+From 70fa360e5bf72b28960747da47d9b85e650ad312 Mon Sep 17 00:00:00 2001
From: Richard Purdie <[email protected]>
Date: Wed, 22 May 2024 13:58:23 +0200
Subject: [PATCH] qemu: Ensure pip and the python venv aren't used for meson
@@ -29,10 +29,10 @@ Signed-off-by: Richard Purdie
<[email protected]>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
-index 84e429409..1a9585e8e 100755
+index 217af781f..cf8666337 100755
--- a/configure
+++ b/configure
-@@ -981,14 +981,14 @@ python="$(command -v "$python")"
+@@ -951,14 +951,14 @@ python="$(command -v "$python")"
echo "python determined to be '$python'"
echo "python version: $($python --version)"
@@ -47,5 +47,5 @@ index 84e429409..1a9585e8e 100755
-mkvenv="$python ${source_path}/python/scripts/mkvenv.py"
+mkvenv=true
- # Finish preparing the virtual environment using vendored .whl files
-
+ # Finish preparing the virtual environment using vendored .whl files.
+ # Even if PyPI is allowed, we disallow it here to force installation
diff --git a/meta/recipes-devtools/qemu/qemu/fix-strerrorname_np.patch
b/meta/recipes-devtools/qemu/qemu/fix-strerrorname_np.patch
deleted file mode 100644
index 524e20a3dd..0000000000
--- a/meta/recipes-devtools/qemu/qemu/fix-strerrorname_np.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 475dbdbee7ff878d113f45a1a623e9abbf0e55f3 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <[email protected]>
-Date: Wed, 18 Sep 2024 16:19:37 -0700
-Subject: [PATCH] target/riscv/kvm: do not use non-portable strerrorname_np()
-
-strerrorname_np is non-portable and breaks building with musl libc.
-
-Use strerror(errno) instead, like we do other places.
-
-Upstream-Status: Submitted
[https://mail.gnu.org/archive/html/qemu-stable/2023-12/msg00069.html]
-
-Cc: [email protected]
-Fixes: commit 082e9e4a58ba (target/riscv/kvm: improve 'init_multiext_cfg' error
-msg)
-Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2041
-Buglink: https://gitlab.alpinelinux.org/alpine/aports/-/issues/15541
-Signed-off-by: Natanael Copa <[email protected]>
----
- target/riscv/kvm/kvm-cpu.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c
-index e06d2126b..e1cc02fba 100644
---- a/target/riscv/kvm/kvm-cpu.c
-+++ b/target/riscv/kvm/kvm-cpu.c
-@@ -1994,8 +1994,7 @@ static bool kvm_cpu_realize(CPUState *cs, Error **errp)
- if (riscv_has_ext(&cpu->env, RVV)) {
- ret = prctl(PR_RISCV_V_SET_CONTROL, PR_RISCV_V_VSTATE_CTRL_ON);
- if (ret) {
-- error_setg(errp, "Error in prctl PR_RISCV_V_SET_CONTROL, code:
%s",
-- strerrorname_np(errno));
-+ error_setg(errp, "Error in prctl PR_RISCV_V_SET_CONTROL, error
%d", errno);
- return false;
- }
- }
diff --git a/meta/recipes-devtools/qemu/qemu_10.2.0.bb
b/meta/recipes-devtools/qemu/qemu_11.0.0.bb
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu_10.2.0.bb
rename to meta/recipes-devtools/qemu/qemu_11.0.0.bb
--
2.49.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#236459):
https://lists.openembedded.org/g/openembedded-core/message/236459
Mute This Topic: https://lists.openembedded.org/mt/119154124/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
