From: Alexander Kanavin Date: Mon, 22 Dec 2025 20:07:11 +0000 (+0100) Subject: qemu: upgrade 10.0.7 -> 10.1.3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11bfa5fbabb048341872bf294c4568368066978f;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git qemu: upgrade 10.0.7 -> 10.1.3 License-Update: FSF physical address -> URI Signed-off-by: Alexander Kanavin Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-devtools/qemu/qemu-native_10.0.7.bb b/meta/recipes-devtools/qemu/qemu-native_10.1.3.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-native_10.0.7.bb rename to meta/recipes-devtools/qemu/qemu-native_10.1.3.bb diff --git a/meta/recipes-devtools/qemu/qemu-system-native_10.0.7.bb b/meta/recipes-devtools/qemu/qemu-system-native_10.1.3.bb similarity index 97% rename from meta/recipes-devtools/qemu/qemu-system-native_10.0.7.bb rename to meta/recipes-devtools/qemu/qemu-system-native_10.1.3.bb index 22462e2499e..2e4f7328ad1 100644 --- a/meta/recipes-devtools/qemu/qemu-system-native_10.0.7.bb +++ b/meta/recipes-devtools/qemu/qemu-system-native_10.1.3.bb @@ -22,6 +22,7 @@ do_install:append() { # The following is also installed by qemu-native rm -f ${D}${datadir}/qemu/trace-events-all rm -rf ${D}${datadir}/qemu/keymaps + rm -rf ${D}${datadir}/qemu/dtb rm -rf ${D}${datadir}/icons/ rm -rf ${D}${includedir}/qemu-plugin.h diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 908dca7d5d1..eb4a5f71bc3 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -15,8 +15,9 @@ require qemu-targets.inc # we need a full python3-native setup inherit pkgconfig ptest update-rc.d systemd python3native -LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ - file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f" +LIC_FILES_CHKSUM = "file://COPYING;md5=a3b50d8b88dcc0eb3d7d39b760b9e821 \ + file://COPYING.LIB;endline=24;md5=8a8178c06478747a771588adec965232 \ + " SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://powerpc_rom.bin \ @@ -39,7 +40,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ UPSTREAM_CHECK_URI = "https://www.qemu.org" UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" -SRC_URI[sha256sum] = "faeea5d45a4d9bdde60716814eafadac4286f8a03ce757be632671e0eaa4ce0b" +SRC_URI[sha256sum] = "fbaa7a0d7a9a1deb5695b125916746ec28fe0de6275d4454f3e3bbaf8b339b53" 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." 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 f27208f45f4..bc8dace013d 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 27273fcac6857750f07a2632bdb6b0ed66ae982a Mon Sep 17 00:00:00 2001 +From f2d9bc614f7edf66412209aba78aa086e65dc75e Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Fri, 28 Mar 2014 17:42:43 +0800 Subject: [PATCH] qemu: Add addition environment space to boot loader @@ -18,7 +18,7 @@ Signed-off-by: Roy Li 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/mips/malta.c b/hw/mips/malta.c -index 8e9cea70b..2268a8b61 100644 +index cbdbb2105..62681fdae 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -65,7 +65,7 @@ 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 ad5c5ba03ee..afbe1bd381e 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 19b95073e5d42dc4aa5392da3d422ab668003107 Mon Sep 17 00:00:00 2001 +From 945af9ecc80653955cbdbb7d3e28dce61795b251 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Tue, 26 Feb 2013 11:43:28 -0500 Subject: [PATCH] apic: fixup fallthrough to PIC @@ -29,10 +29,10 @@ Signed-off-by: He Zhe 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/intc/apic.c b/hw/intc/apic.c -index d18c1dbf2..45dde1fc5 100644 +index 143d08f1a..5bb008d59 100644 --- a/hw/intc/apic.c +++ b/hw/intc/apic.c -@@ -758,7 +758,7 @@ int apic_accept_pic_intr(DeviceState *dev) +@@ -756,7 +756,7 @@ int apic_accept_pic_intr(DeviceState *dev) APICCommonState *s = APIC(dev); 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 c04e42608f5..2e738abaa3a 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 913064f9fe724fa1b70b9bf6dd3444c7dddeb928 Mon Sep 17 00:00:00 2001 +From f8c1614b204c1d64af906dc70dbf4a1534eb6b38 Mon Sep 17 00:00:00 2001 From: Oleksiy Obitotskyy 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 1 file changed, 2 insertions(+) diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 8bfe4912e..d04984f66 100644 +index c236b2834..2a3527a87 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -118,7 +118,9 @@ +@@ -119,7 +119,9 @@ #include #include #include 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 388d11d10d2..ffbbb1ab326 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 f2adfc703e94819b0daca98fde1d0a30168c292d Mon Sep 17 00:00:00 2001 +From 3621615790270449bf9c8a0777e8ef28eb762bf9 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 8 Jan 2021 17:27:06 +0000 Subject: [PATCH] qemu: Add some user space mmap tweaks to address musl 32 bit @@ -22,10 +22,10 @@ Signed-off-by: Richard Purdie Date: Mon, 1 Mar 2021 13:00:47 +0000 Subject: [PATCH] qemu: Determinism fixes @@ -16,10 +16,10 @@ RP 2021/3/1 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/decodetree.py b/scripts/decodetree.py -index e8b72da3a..5cd86b142 100644 +index f992472b7..2e4218b14 100644 --- a/scripts/decodetree.py +++ b/scripts/decodetree.py -@@ -1558,7 +1558,7 @@ def main(): +@@ -1559,7 +1559,7 @@ def main(): toppat = ExcMultiPattern(0) for filename in args: 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 7c24f432f24..a58c936d068 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 ebeab06747306ec16299207bf4bd7481a472b4de Mon Sep 17 00:00:00 2001 +From 097b75ad8310143decab92f6d1744144e7a4809f Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Thu, 14 Jan 2021 06:33:04 +0000 Subject: [PATCH] tests/meson.build: use relative path to refer to files 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 54421544bb5..af0eafb65f6 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 9c225234a756f2745cf04c3c3af6ef6b6acf4277 Mon Sep 17 00:00:00 2001 +From 9d5deb767523ea0d1aeecb9960244c702530acad Mon Sep 17 00:00:00 2001 From: Khem Raj 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 28a10d98bd7..6e9350ad740 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 9adf3fc3ea2cbccb41d49695a53c74fed6850fb0 Mon Sep 17 00:00:00 2001 +From aaec67c133dddda7204d23964732b4b788cbc9ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Hundeb=C3=B8ll?= Date: Wed, 22 May 2024 14:02:55 +0200 Subject: [PATCH] configure: lookup meson exutable from PATH @@ -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 02f1dd231..2c5ecd346 100755 +index 274a77876..84e429409 100755 --- a/configure +++ b/configure -@@ -983,12 +983,7 @@ mkvenv="$python ${source_path}/python/scripts/mkvenv.py" +@@ -995,12 +995,7 @@ mkvenv="$python ${source_path}/python/scripts/mkvenv.py" $mkvenv ensuregroup --dir "${source_path}/python/wheels" \ ${source_path}/pythondeps.toml meson || exit 1 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 b06020d106a..d04596d313a 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 0d85988457a475c25b84085cf090040150a9c16d Mon Sep 17 00:00:00 2001 +From c9f174b2f7b43e59e91f88c75c8b3e2ee30bfcdd Mon Sep 17 00:00:00 2001 From: Richard Purdie 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 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure -index 2c5ecd346..5315ede35 100755 +index 84e429409..1a9585e8e 100755 --- a/configure +++ b/configure -@@ -969,14 +969,14 @@ python="$(command -v "$python")" +@@ -981,14 +981,14 @@ python="$(command -v "$python")" echo "python determined to be '$python'" echo "python version: $($python --version)" diff --git a/meta/recipes-devtools/qemu/qemu/0012-hw-sd-sdcard-Fix-size-check-for-backing-block-image.patch b/meta/recipes-devtools/qemu/qemu/0012-hw-sd-sdcard-Fix-size-check-for-backing-block-image.patch index a8e570db335..431b49bad70 100644 --- a/meta/recipes-devtools/qemu/qemu/0012-hw-sd-sdcard-Fix-size-check-for-backing-block-image.patch +++ b/meta/recipes-devtools/qemu/qemu/0012-hw-sd-sdcard-Fix-size-check-for-backing-block-image.patch @@ -1,7 +1,7 @@ -From be0a5f477ae2c73d80ade595f28783d85e1ef3e0 Mon Sep 17 00:00:00 2001 +From 9b262cda68d2b687f803a8030d3a1ad29a93a41e Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Sun, 24 Aug 2025 09:18:33 +0200 -Subject: [PATCH 10/10] hw/sd/sdcard: Fix size check for backing block image +Subject: [PATCH] hw/sd/sdcard: Fix size check for backing block image MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -28,10 +28,10 @@ Signed-off-by: Mathieu Dubois-Briand 1 file changed, 47 insertions(+), 20 deletions(-) diff --git a/hw/sd/sd.c b/hw/sd/sd.c -index e541c57f8c3c..db86849b8512 100644 +index 8c290595f..58387440b 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c -@@ -2675,9 +2675,32 @@ static void sd_instance_finalize(Object *obj) +@@ -2767,9 +2767,32 @@ static void sd_instance_finalize(Object *obj) timer_free(sd->ocr_power_timer); } @@ -64,7 +64,7 @@ index e541c57f8c3c..db86849b8512 100644 int ret; switch (sd->spec_version) { -@@ -2690,32 +2713,36 @@ static void sd_realize(DeviceState *dev, Error **errp) +@@ -2782,32 +2805,36 @@ static void sd_realize(DeviceState *dev, Error **errp) } if (sd->blk) { @@ -121,6 +121,3 @@ index e541c57f8c3c..db86849b8512 100644 return; } --- -2.47.3 - diff --git a/meta/recipes-devtools/qemu/qemu/fix-strerrorname_np.patch b/meta/recipes-devtools/qemu/qemu/fix-strerrorname_np.patch index 1cc973443e0..524e20a3dd4 100644 --- a/meta/recipes-devtools/qemu/qemu/fix-strerrorname_np.patch +++ b/meta/recipes-devtools/qemu/qemu/fix-strerrorname_np.patch @@ -1,4 +1,4 @@ -From 7e09654fa179ad5fab1dc0a47886c6a1a2acc097 Mon Sep 17 00:00:00 2001 +From 475dbdbee7ff878d113f45a1a623e9abbf0e55f3 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 18 Sep 2024 16:19:37 -0700 Subject: [PATCH] target/riscv/kvm: do not use non-portable strerrorname_np() @@ -20,10 +20,10 @@ Signed-off-by: Natanael Copa 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/target/riscv/kvm/kvm-cpu.c b/target/riscv/kvm/kvm-cpu.c -index 8001ca153..79fb43f92 100644 +index e06d2126b..e1cc02fba 100644 --- a/target/riscv/kvm/kvm-cpu.c +++ b/target/riscv/kvm/kvm-cpu.c -@@ -1968,8 +1968,7 @@ static bool kvm_cpu_realize(CPUState *cs, Error **errp) +@@ -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) { diff --git a/meta/recipes-devtools/qemu/qemu_10.0.7.bb b/meta/recipes-devtools/qemu/qemu_10.1.3.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu_10.0.7.bb rename to meta/recipes-devtools/qemu/qemu_10.1.3.bb