Skip to content

qemu: update to 11.1.1 #30404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AndyChiang888 wants to merge 1 commit into
base: master
Choose a base branch
from
+13 −75
Open

qemu: update to 11.1.1 #30404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions utils/qemu/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <yszhou4tech@gmail.com>
Expand All @@ -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)
Comment thread
AndyChiang888 marked this conversation as resolved.
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
Expand Down Expand Up @@ -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), \
Expand Down Expand Up @@ -395,7 +395,6 @@ CONFIGURE_ARGS += \
--disable-fuse \
--disable-gcrypt \
--disable-download \
--disable-glusterfs \
--disable-gnutls \
--disable-guest-agent-msi \
--disable-libiscsi \
Expand Down
6 changes: 3 additions & 3 deletions utils/qemu/patches/0001-configure-allow-disable-fortify_source.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
61 changes: 0 additions & 61 deletions utils/qemu/patches/0003-qga-invoke-separate-applets-for-guest-shutdown-modes.patch
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion utils/qemu/patches/0004-fix-meson-cross-build-compiler-sanity-check.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading