https://wiki.qemu.org/ChangeLog/9.2 Virtfs stuff deprecated. Nitro enclave support. Take a look at the deprecated and build dependencies. Seems like TGC has gone 64-bit only.
* Move patches forward. Applies cleanly. * Introduce new configuration options for pixman and keyutils. * Rearrange and fix options. Drop other unused options. Could still use cleaning. Signed-off-by: Christian Melki <[email protected]> --- ...symlinks-for-security_model-mapped-f.patch | 0 patches/{qemu-9.1.2 => qemu-9.2.0}/series | 0 rules/qemu.in | 14 ++++++++++++ rules/qemu.make | 22 ++++++++++++++----- 4 files changed, 31 insertions(+), 5 deletions(-) rename patches/{qemu-9.1.2 => qemu-9.2.0}/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch (100%) rename patches/{qemu-9.1.2 => qemu-9.2.0}/series (100%) diff --git a/patches/qemu-9.1.2/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch b/patches/qemu-9.2.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch similarity index 100% rename from patches/qemu-9.1.2/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch rename to patches/qemu-9.2.0/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch diff --git a/patches/qemu-9.1.2/series b/patches/qemu-9.2.0/series similarity index 100% rename from patches/qemu-9.1.2/series rename to patches/qemu-9.2.0/series diff --git a/rules/qemu.in b/rules/qemu.in index bc74e0537..b92340fea 100644 --- a/rules/qemu.in +++ b/rules/qemu.in @@ -14,9 +14,11 @@ menuconfig QEMU select ZLIB select SDL2 if QEMU_SDL select GTK if QEMU_GTK + select PIXMAN if QEMU_PIXMAN select LIBUSB if QEMU_SYS select PIXMAN if QEMU_SYS select PULSEAUDIO if QEMU_PULSEAUDIO + select KEYUTILS if QEMU_KEYUTILS select ALSA_LIB if QEMU_ALSA select PIPEWIRE if QEMU_PIPEWIRE help @@ -46,6 +48,12 @@ config QEMU_GTK help Say y to build with GTK support. +config QEMU_PIXMAN + bool + prompt "Enable pixman support." + help + Say y to build with pixman support. + config QEMU_PULSEAUDIO bool prompt "Enable pulseaudio output support." @@ -64,6 +72,12 @@ config QEMU_PIPEWIRE help Say y to build with pipewire support. +config QEMU_KEYUTILS + bool + prompt "Enable keyutils library support." + help + Say y to build with keyutils. + config QEMU_TOOLS bool prompt "Enable tools" diff --git a/rules/qemu.make b/rules/qemu.make index 8490eee25..080d7ba71 100644 --- a/rules/qemu.make +++ b/rules/qemu.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_QEMU) += qemu # # Paths and names # -QEMU_VERSION := 9.1.2 -QEMU_MD5 := ea4bb735d60ad3392875f7cd48e551af +QEMU_VERSION := 9.2.0 +QEMU_MD5 := ece615b98642720430236e20237dd936 QEMU := qemu-$(QEMU_VERSION) QEMU_SUFFIX := tar.xz QEMU_URL := https://download.qemu.org/$(QEMU).$(QEMU_SUFFIX) @@ -51,7 +51,6 @@ QEMU_CONF_OPT := \ --cross-prefix=$(CROSS_COMPILE) \ --ninja=ninja \ --disable-download \ - --disable-sanitizers \ --disable-tsan \ --disable-werror \ --enable-stack-protector \ @@ -87,10 +86,12 @@ QEMU_CONF_OPT := \ --disable-capstone \ --disable-cloop \ --disable-cocoa \ + --disable-colo-proxy \ --disable-coreaudio \ --disable-crypto-afalg \ --disable-curl \ --disable-curses \ + --disable-dbus-display \ --disable-dmg \ --disable-docs \ --disable-dsound \ @@ -105,15 +106,18 @@ QEMU_CONF_OPT := \ --$(call ptx/endis, PTXCONF_QEMU_GTK)-gtk-clipboard \ --disable-guest-agent \ --disable-guest-agent-msi \ + --disable-hv-balloon \ --disable-hvf \ --enable-iconv \ --disable-jack \ --disable-keyring \ --enable-kvm \ --disable-l2tpv3 \ + --disable-libcbor \ --disable-libdaxctl \ --disable-libdw \ --disable-libiscsi \ + --$(call ptx/endis, PTXCONF_QEMU_KEYUTILS)-libkeyutils \ --disable-libnfs \ --disable-libpmem \ --disable-libssh \ @@ -135,15 +139,20 @@ QEMU_CONF_OPT := \ --disable-opengl \ --disable-oss \ --$(call ptx/endis, PTXCONF_QEMU_PULSEAUDIO)-pa \ - --$(call ptx/endis, PTXCONF_QEMU_PIPEWIRE)-pipewire \ --disable-parallels \ + --$(call ptx/endis, PTXCONF_QEMU_PIPEWIRE)-pipewire \ + --$(call ptx/endis, PTXCONF_QEMU_PIXMAN)-pixman \ --disable-png \ + --disable-qatzip \ --disable-qcow1 \ --disable-qed \ --disable-qga-vss \ + --disable-qpl \ --disable-rbd \ --disable-rdma \ --disable-replication \ + --disable-rust \ + --disable-rutabaga-gfx \ --$(call ptx/endis, PTXCONF_QEMU_SDL)-sdl \ --disable-sdl-image \ --disable-seccomp \ @@ -160,11 +169,13 @@ QEMU_CONF_OPT := \ --$(call ptx/endis, PTXCONF_QEMU_TOOLS)-tools \ --disable-tpm \ --disable-u2f \ + --disable-uadk \ --disable-usb-redir \ --disable-vde \ --disable-vdi \ --disable-vduse-blk-export \ --disable-vfio-user-server \ + --disable-vhdx \ --disable-vhost-crypto \ --enable-vhost-kernel \ --enable-vhost-net \ @@ -173,10 +184,12 @@ QEMU_CONF_OPT := \ --disable-vhost-vdpa \ --disable-virglrenderer \ --$(call ptx/endis, PTXCONF_QEMU_SYS)-virtfs \ + --disable-vmdk \ --disable-vmnet \ --disable-vnc \ --disable-vnc-jpeg \ --disable-vnc-sasl \ + --disable-vpc \ --disable-vte \ --disable-vvfat \ --disable-whpx \ @@ -233,7 +246,6 @@ ifdef PTXCONF_QEMU_SYS @$(call install_copy, qemu, 0, 0, 0755, -, /usr/bin/qemu-system-$(target))$(ptx/nl)) ifdef PTXCONF_QEMU_TOOLS - @$(call install_copy, qemu, 0, 0, 0755, -, /usr/libexec/virtfs-proxy-helper) @$(call install_copy, qemu, 0, 0, 0755, -, /usr/libexec/qemu-bridge-helper) endif -- 2.34.1
