From 2a1cc8cc9ecd992ba7591824b689d31614c6852f Mon Sep 17 00:00:00 2001 From: Andy Chiang Date: Mon, 31 Aug 2026 19:52:25 +0700 Subject: [PATCH] qemu: update to 11.1.1 - Update to 11.1.1 (10.1.x is EOL,ref https://wiki.qemu.org/Planning/10.1) - Refresh patches - Remove `0003-qga-invoke-separate-applets-for-guest-shutdown-modes.patch`, this issue has been fixed upstream, ref https://github.com/qemu/qemu/commit/c5b4afd4d56e9c2251e6674d8c9ae530a923ecb9 - `PKG_BUILD_DEPENDS` add `python-setuptools/host` - Remove `--disable-glusterfs`, 11.1 deprecated this,ref https://github.com/qemu/qemu/blob/stable-11.1/docs/about/removed-features.rst - Remove `linuxboot.bin`, change `multiboot.bin`to `multiboot_dma.bin`, ref https://github.com/qemu/qemu/commit/e818b4b10969927019a0a2be5b71aad7a8e0f6a7 and https://github.com/qemu/qemu/commit/88641f4df388faa78c49c54ed885e530fd0a75dc - Drop i386 support,ref https://github.com/qemu/qemu/commit/25512d6865e24976a67f034a1a5be8da266bc58c Changelog: https://www.mail-archive.com/qemu-devel@nongnu.org/msg1220561.html Signed-off-by: Andy Chiang --- utils/qemu/Makefile | 19 +++--- ...nfigure-allow-disable-fortify_source.patch | 6 +- ...ate-applets-for-guest-shutdown-modes.patch | 61 ------------------- ...on-cross-build-compiler-sanity-check.patch | 2 +- 4 files changed, 13 insertions(+), 75 deletions(-) delete mode 100644 utils/qemu/patches/0003-qga-invoke-separate-applets-for-guest-shutdown-modes.patch diff --git a/utils/qemu/Makefile b/utils/qemu/Makefile index af1a5d3328ffdb..cb9c4fa6d0b45c 100644 --- a/utils/qemu/Makefile +++ b/utils/qemu/Makefile @@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qemu -PKG_VERSION:=10.1.3 -PKG_RELEASE:=3 +PKG_VERSION:=11.1.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://download.qemu.org/ -PKG_HASH:=fbaa7a0d7a9a1deb5695b125916746ec28fe0de6275d4454f3e3bbaf8b339b53 +PKG_HASH:=079ffbff8a7111bbc89022107cbabf3bbfd614d5fc9d7cc675991196aca12482 PKG_LICENSE:=GPL-2.0-only PKG_LICENSE_FILES:=LICENSE tcg/LICENSE PKG_MAINTAINER:=Yousong Zhou @@ -25,15 +25,16 @@ PKG_BUILD_FLAGS:=no-mips16 PKG_BUILD_DEPENDS+=spice-protocol PKG_BUILD_DEPENDS+=python3/host +PKG_BUILD_DEPENDS+=python-setuptools/host include $(INCLUDE_DIR)/nls.mk include $(INCLUDE_DIR)/package.mk include ../../lang/python/python3-host.mk -QEMU_DEPS_IN_GUEST := @(TARGET_x86||TARGET_x86_64||TARGET_armsr||TARGET_malta) -QEMU_DEPS_IN_HOST := @(TARGET_x86_64||TARGET_armsr_armv8||TARGET_sunxi||TARGET_rockchip) -QEMU_DEPS_IN_HOST += +libstdcpp -QEMU_DEPS_IN_HOST += $(ICONV_DEPENDS) +QEMU_DEPS_IN_GUEST :=@(TARGET_x86_64||TARGET_armsr||TARGET_malta) +QEMU_DEPS_IN_HOST :=@(TARGET_x86_64||TARGET_armsr_armv8||TARGET_sunxi||TARGET_rockchip) +QEMU_DEPS_IN_HOST +=+libstdcpp +QEMU_DEPS_IN_HOST +=$(ICONV_DEPENDS) define Package/virtio-console-helper SECTION:=utils @@ -230,9 +231,8 @@ qemu-target-x86_64-softmmu-deps:= \ +qemu-firmware-seavgabios qemu-target-x86_64-softmmu-extra-files:= \ usr/share/qemu/kvmvapic.bin \ - usr/share/qemu/linuxboot.bin \ usr/share/qemu/linuxboot_dma.bin \ - usr/share/qemu/multiboot.bin \ + usr/share/qemu/multiboot_dma.bin \ usr/share/qemu/pvh.bin $(foreach target,$(qemu-target-list), \ @@ -395,7 +395,6 @@ CONFIGURE_ARGS += \ --disable-fuse \ --disable-gcrypt \ --disable-download \ - --disable-glusterfs \ --disable-gnutls \ --disable-guest-agent-msi \ --disable-libiscsi \ diff --git a/utils/qemu/patches/0001-configure-allow-disable-fortify_source.patch b/utils/qemu/patches/0001-configure-allow-disable-fortify_source.patch index 57ea83d1965af0..e1b91ae05ab433 100644 --- a/utils/qemu/patches/0001-configure-allow-disable-fortify_source.patch +++ b/utils/qemu/patches/0001-configure-allow-disable-fortify_source.patch @@ -11,12 +11,12 @@ OpenWrt base build system decide flavor of fortify_source to use --- a/configure +++ b/configure -@@ -791,6 +791,8 @@ for opt do +@@ -744,6 +744,8 @@ for opt do ;; --disable-rust) rust=disabled ;; + --disable-fortify-source) fortify_source="no" + ;; - # everything else has the same name in configure and meson - --*) meson_option_parse "$opt" "$optarg" + --wasm64-32bit-address-limit) ;; + # everything else has the same name in configure and meson diff --git a/utils/qemu/patches/0003-qga-invoke-separate-applets-for-guest-shutdown-modes.patch b/utils/qemu/patches/0003-qga-invoke-separate-applets-for-guest-shutdown-modes.patch deleted file mode 100644 index 68128bfca836cf..00000000000000 --- a/utils/qemu/patches/0003-qga-invoke-separate-applets-for-guest-shutdown-modes.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 3e7a53edd1ffc948e1f46b3493e0c0381e437980 Mon Sep 17 00:00:00 2001 -From: Vladimir Ermakov -Date: Tue, 27 May 2025 09:53:37 +0200 -Subject: [PATCH 3/4] qga: invoke separate applets for guest shutdown modes - -Origin: community/qemu: fix qemu-guest-agent patch -https://gitlab.alpinelinux.org/alpine/aports/-/blob/b720d51ec844d4754dd5b29084350aa1f5c9a74d/community/qemu/guest-agent-shutdown.patch ---- - qga/commands-posix.c | 30 ++++-------------------------- - 1 file changed, 4 insertions(+), 26 deletions(-) - ---- a/qga/commands-posix.c -+++ b/qga/commands-posix.c -@@ -218,43 +218,21 @@ void qmp_guest_shutdown(const char *mode - const char *shutdown_flag; - Error *local_err = NULL; - --#ifdef CONFIG_SOLARIS -- const char *powerdown_flag = "-i5"; -- const char *halt_flag = "-i0"; -- const char *reboot_flag = "-i6"; --#elif defined(CONFIG_BSD) -- const char *powerdown_flag = "-p"; -- const char *halt_flag = "-h"; -- const char *reboot_flag = "-r"; --#else -- const char *powerdown_flag = "-P"; -- const char *halt_flag = "-H"; -- const char *reboot_flag = "-r"; --#endif -+ const char *argv[] = {NULL, NULL}; - - slog("guest-shutdown called, mode: %s", mode); - if (!mode || strcmp(mode, "powerdown") == 0) { -- shutdown_flag = powerdown_flag; -+ argv[0] = "poweroff"; - } else if (strcmp(mode, "halt") == 0) { -- shutdown_flag = halt_flag; -+ argv[0] = "halt"; - } else if (strcmp(mode, "reboot") == 0) { -- shutdown_flag = reboot_flag; -+ argv[0] = "reboot"; - } else { - error_setg(errp, - "mode is invalid (valid values are: halt|powerdown|reboot"); - return; - } - -- const char *argv[] = {"/sbin/shutdown", --#ifdef CONFIG_SOLARIS -- shutdown_flag, "-g0", "-y", --#elif defined(CONFIG_BSD) -- shutdown_flag, "+0", --#else -- "-h", shutdown_flag, "+0", --#endif -- "hypervisor initiated shutdown", (char *) NULL}; -- - ga_run_command(argv, NULL, "shutdown", &local_err); - if (local_err) { - error_propagate(errp, local_err); diff --git a/utils/qemu/patches/0004-fix-meson-cross-build-compiler-sanity-check.patch b/utils/qemu/patches/0004-fix-meson-cross-build-compiler-sanity-check.patch index d66f300e18ee90..666d255eb7c550 100644 --- a/utils/qemu/patches/0004-fix-meson-cross-build-compiler-sanity-check.patch +++ b/utils/qemu/patches/0004-fix-meson-cross-build-compiler-sanity-check.patch @@ -9,7 +9,7 @@ Subject: [PATCH 4/4] fix meson cross-build compiler sanity check --- a/configure +++ b/configure -@@ -1868,6 +1868,7 @@ if test "$skip_meson" = no; then +@@ -1832,6 +1832,7 @@ if test "$skip_meson" = no; then echo "# Automatically generated by configure - do not modify" > $cross echo "[properties]" >> $cross