Skip to contentSkip to conversation

qemu: 10.1.3 -> 10.2.0

PATCH New [email protected] 1 participant 1 message Jan 15 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qemu: 10.1.3 -> 10.2.0

From: Kai Kang <[email protected]>

Upgrade qemu from 10.1.3 to 10.2.0:

* remove backported 0012 patch
* update context for patches 0002 and 0010

---
 ...native_10.1.3.bb => qemu-native_10.2.0.bb} |   0
 ...10.1.3.bb => qemu-system-native_10.2.0.bb} |   0
 meta/recipes-devtools/qemu/qemu.inc           |   3 +-
 .../0002-apic-fixup-fallthrough-to-PIC.patch  |  10 +-
 ...gure-lookup-meson-exutable-from-PATH.patch |  26 ++--
 ...x-size-check-for-backing-block-image.patch | 123 ------------------
 .../qemu/{qemu_10.1.3.bb => qemu_10.2.0.bb}   |   0
 7 files changed, 22 insertions(+), 140 deletions(-)
 rename meta/recipes-devtools/qemu/{qemu-native_10.1.3.bb => qemu-native_10.2.0.bb} (100%)
 rename meta/recipes-devtools/qemu/{qemu-system-native_10.1.3.bb => qemu-system-native_10.2.0.bb} (100%)
 delete mode 100644 meta/recipes-devtools/qemu/qemu/0012-hw-sd-sdcard-Fix-size-check-for-backing-block-image.patch
 rename meta/recipes-devtools/qemu/{qemu_10.1.3.bb => qemu_10.2.0.bb} (100%)
meta/recipes-devtools/qemu/qemu-native_10.2.0.bb renamed from meta/recipes-devtools/qemu/qemu-native_10.1.3.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-native_10.1.3.bb
rename to meta/recipes-devtools/qemu/qemu-native_10.2.0.bb
meta/recipes-devtools/qemu/qemu-system-native_10.2.0.bb renamed from meta/recipes-devtools/qemu/qemu-system-native_10.1.3.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu-system-native_10.1.3.bb
rename to meta/recipes-devtools/qemu/qemu-system-native_10.2.0.bb
meta/recipes-devtools/qemu/qemu.inc +1 -2
index eb4a5f71bc..d320b13ba7 100644
@@ -32,7 +32,6 @@ 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://0012-hw-sd-sdcard-Fix-size-check-for-backing-block-image.patch \
            file://qemu-guest-agent.init \
            file://qemu-guest-agent.udev \
            "
@@ -40,7 +39,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
 UPSTREAM_CHECK_URI = "https://www.qemu.org"
 UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
 
-SRC_URI[sha256sum] = "fbaa7a0d7a9a1deb5695b125916746ec28fe0de6275d4454f3e3bbaf8b339b53"
+SRC_URI[sha256sum] = "9e30ad1b8b9f7b4463001582d1ab297f39cfccea5d08540c0ca6d6672785883a"
 
 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."
 
meta/recipes-devtools/qemu/qemu/0002-apic-fixup-fallthrough-to-PIC.patch +7 -3
index afbe1bd381..bfc85f4842 100644
@@ -24,16 +24,20 @@ serviced, is -1.
 Signed-off-by: Mark Asselstine <[email protected]>
 Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2013-04/msg00878.html]
 Signed-off-by: He Zhe <[email protected]>
+
+Update context for qemu 10.2.0.
+
+Signed-off-by: Kai Kang <[email protected]>
 ---
  hw/intc/apic.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/hw/intc/apic.c b/hw/intc/apic.c
-index 143d08f1a..5bb008d59 100644
+index aad253a..212b01f 100644
 --- a/hw/intc/apic.c
 +++ b/hw/intc/apic.c
-@@ -756,7 +756,7 @@ int apic_accept_pic_intr(DeviceState *dev)
-     APICCommonState *s = APIC(dev);
+@@ -740,7 +740,7 @@ int apic_accept_pic_intr(APICCommonState *s)
+ {
      uint32_t lvt0;
  
 -    if (!s)
meta/recipes-devtools/qemu/qemu/0010-configure-lookup-meson-exutable-from-PATH.patch +14 -12
index 6e9350ad74..db88766cf6 100644
@@ -4,24 +4,26 @@ Date: Wed, 22 May 2024 14:02:55 +0200
 Subject: [PATCH] configure: lookup meson exutable from PATH
 
 Upstream-Status: Inappropriate [workaround, would need a real fix for upstream]
+
+Update context for qemu 10.2.0.
+
+Signed-off-by: Kai Kang <[email protected]>
 ---
- configure | 7 +------
- 1 file changed, 1 insertion(+), 6 deletions(-)
+ configure | 5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
 
 diff --git a/configure b/configure
-index 274a77876..84e429409 100755
+index 82cace1..83bbda9 100755
 --- a/configure
 +++ b/configure
-@@ -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
+@@ -993,10 +993,7 @@ get_pwd() {
+     fi
+ }
  
--# At this point, we expect Meson to be installed and available.
--# We expect mkvenv or pip to have created pyvenv/bin/meson for us.
--# We ignore PATH completely here: we want to use the venv's Meson
--# *exclusively*.
--
--meson="$(cd pyvenv/bin; pwd)/meson"
+-meson="$(cd pyvenv/bin; get_pwd)/meson"
+-if [ -f "$meson$EXESUF" ]; then
+-  meson="$meson$EXESUF"
+-fi
 +meson=`which meson`
  
  # Conditionally ensure Sphinx is installed.
meta/recipes-devtools/qemu/qemu/0012-hw-sd-sdcard-Fix-size-check-for-backing-block-image.patch deleted +0 -123

123 lines not on this page · raw message

meta/recipes-devtools/qemu/qemu_10.2.0.bb renamed from meta/recipes-devtools/qemu/qemu_10.1.3.bb +0 -0
similarity index 100%
rename from meta/recipes-devtools/qemu/qemu_10.1.3.bb
rename to meta/recipes-devtools/qemu/qemu_10.2.0.bb
Signature · 1 line
2.34.1