qemu: update to 8.0.0

- Update version to 8.0.0
- Refresh patches
- Update configure opttions to disable libdw

Signed-off-by: Vladimir Ermakov <vooon341@gmail.com>
This commit is contained in:
Vladimir Ermakov 2023-04-20 12:23:19 +02:00 committed by Yousong Zhou
parent 837c0f7f1c
commit 65d052d9b8
4 changed files with 12 additions and 11 deletions

View file

@ -9,10 +9,10 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=qemu PKG_NAME:=qemu
PKG_VERSION:=7.2.0 PKG_VERSION:=8.0.0
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_HASH:=5b49ce2687744dad494ae90a898c52204a3406e84d072482a1e1be854eeb2157 PKG_HASH:=bb60f0341531181d6cc3969dd19a013d0427a87f918193970d9adb91131e56d0
PKG_SOURCE_URL:=http://download.qemu.org/ PKG_SOURCE_URL:=http://download.qemu.org/
PKG_LICENSE:=GPL-2.0-only PKG_LICENSE:=GPL-2.0-only
PKG_LICENSE_FILES:=LICENSE tcg/LICENSE PKG_LICENSE_FILES:=LICENSE tcg/LICENSE
@ -430,6 +430,7 @@ CONFIGURE_ARGS += \
--disable-alsa \ --disable-alsa \
--disable-pa \ --disable-pa \
--disable-vduse-blk-export \ --disable-vduse-blk-export \
--disable-libdw \
CONFIGURE_ARGS += --target-list='$(foreach target,$(qemu-target-list),$(if $(CONFIG_PACKAGE_qemu-$(target)),$(target)))' CONFIGURE_ARGS += --target-list='$(foreach target,$(qemu-target-list),$(if $(CONFIG_PACKAGE_qemu-$(target)),$(target)))'
CONFIGURE_ARGS += $(if $(CONFIG_PACKAGE_qemu-ga),--enable-guest-agent) CONFIGURE_ARGS += $(if $(CONFIG_PACKAGE_qemu-ga),--enable-guest-agent)

View file

@ -11,9 +11,9 @@ OpenWrt base build system decide flavor of fortify_source to use
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -896,6 +896,8 @@ for opt do @@ -895,6 +895,8 @@ for opt do
;; ;;
--enable-jemalloc) meson_option_parse --enable-malloc=jemalloc jemalloc --disable-vfio-user-server) vfio_user_server="disabled"
;; ;;
+ --disable-fortify-source) fortify_source="no" + --disable-fortify-source) fortify_source="no"
+ ;; + ;;

View file

@ -13,17 +13,17 @@ https://gitlab.alpinelinux.org/alpine/aports/commit/76b81b486480fd9c3294cd420bcf
--- a/qga/commands-posix.c --- a/qga/commands-posix.c
+++ b/qga/commands-posix.c +++ b/qga/commands-posix.c
@@ -74,6 +74,7 @@ static void ga_wait_child(pid_t pid, int @@ -76,6 +76,7 @@ static void ga_wait_child(pid_t pid, int
void qmp_guest_shutdown(bool has_mode, const char *mode, Error **errp) void qmp_guest_shutdown(const char *mode, Error **errp)
{ {
const char *shutdown_flag; const char *shutdown_flag;
+ const char *fallback_cmd = NULL; + const char *fallback_cmd = NULL;
Error *local_err = NULL; Error *local_err = NULL;
pid_t pid; pid_t pid;
int status; int status;
@@ -95,10 +96,13 @@ void qmp_guest_shutdown(bool has_mode, c @@ -97,10 +98,13 @@ void qmp_guest_shutdown(const char *mode
slog("guest-shutdown called, mode: %s", mode); slog("guest-shutdown called, mode: %s", mode);
if (!has_mode || strcmp(mode, "powerdown") == 0) { if (!mode || strcmp(mode, "powerdown") == 0) {
shutdown_flag = powerdown_flag; shutdown_flag = powerdown_flag;
+ fallback_cmd = "/sbin/poweroff"; + fallback_cmd = "/sbin/poweroff";
} else if (strcmp(mode, "halt") == 0) { } else if (strcmp(mode, "halt") == 0) {
@ -35,7 +35,7 @@ https://gitlab.alpinelinux.org/alpine/aports/commit/76b81b486480fd9c3294cd420bcf
} else { } else {
error_setg(errp, error_setg(errp,
"mode is invalid (valid values are: halt|powerdown|reboot"); "mode is invalid (valid values are: halt|powerdown|reboot");
@@ -123,6 +127,7 @@ void qmp_guest_shutdown(bool has_mode, c @@ -125,6 +129,7 @@ void qmp_guest_shutdown(const char *mode
execl("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0", execl("/sbin/shutdown", "shutdown", "-h", shutdown_flag, "+0",
"hypervisor initiated shutdown", (char *)NULL); "hypervisor initiated shutdown", (char *)NULL);
#endif #endif

View file

@ -1,6 +1,6 @@
--- a/meson.build --- a/meson.build
+++ b/meson.build +++ b/meson.build
@@ -3142,10 +3142,6 @@ subdir('common-user') @@ -3191,10 +3191,6 @@ subdir('common-user')
subdir('bsd-user') subdir('bsd-user')
subdir('linux-user') subdir('linux-user')
@ -11,7 +11,7 @@
# accel modules # accel modules
tcg_real_module_ss = ss.source_set() tcg_real_module_ss = ss.source_set()
tcg_real_module_ss.add_all(when: 'CONFIG_TCG_MODULAR', if_true: tcg_module_ss) tcg_real_module_ss.add_all(when: 'CONFIG_TCG_MODULAR', if_true: tcg_module_ss)
@@ -3633,10 +3629,6 @@ subdir('scripts') @@ -3682,10 +3678,6 @@ subdir('scripts')
subdir('tools') subdir('tools')
subdir('pc-bios') subdir('pc-bios')
subdir('docs') subdir('docs')