From 8395e66a04955667ba14acf6a4ec431035bf421f Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Fri, 16 Dec 2022 17:33:10 +1100 Subject: [PATCH 1/2] qemu: update to 8.0.0. --- .../qemu/patches/fix-linux-user-ppc32.patch | 47 ------------------- srcpkgs/qemu/template | 8 ++-- 2 files changed, 4 insertions(+), 51 deletions(-) diff --git a/srcpkgs/qemu/patches/fix-linux-user-ppc32.patch b/srcpkgs/qemu/patches/fix-linux-user-ppc32.patch index cd47435d5aa9..ac7d2e51a4d9 100644 --- a/srcpkgs/qemu/patches/fix-linux-user-ppc32.patch +++ b/srcpkgs/qemu/patches/fix-linux-user-ppc32.patch @@ -7,9 +7,6 @@ Date: Fri Jul 1 16:53:55 2022 +0200 Partial revert https://gitlab.com/qemu-project/qemu/-/commit/9d1401b79463e74adbfac69d836789d4e103fb61 and https://gitlab.com/qemu-project/qemu/-/commit/0a7e01904d407baa73c1baddbdfc9ccf2ace8356 -diff --git a/common-user/host/ppc/safe-syscall.inc.S b/common-user/host/ppc/safe-syscall.inc.S -new file mode 100644 -index 0000000..e69de29 diff --git a/common-user/safe-syscall-error.c b/common-user/safe-syscall-error.c index cf74b50..a36132c 100644 --- a/common-user/safe-syscall-error.c @@ -51,50 +48,6 @@ index 61a04e2..793fe84 100644 +#endif + #endif -diff --git a/linux-user/include/host/ppc/host-signal.h b/linux-user/include/host/ppc/host-signal.h -new file mode 100644 -index 0000000..b80384d ---- /dev/null -+++ b/linux-user/include/host/ppc/host-signal.h -@@ -0,0 +1,38 @@ -+/* -+ * host-signal.h: signal info dependent on the host architecture -+ * -+ * Copyright (c) 2003-2005 Fabrice Bellard -+ * Copyright (c) 2021 Linaro Limited -+ * -+ * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. -+ * See the COPYING file in the top-level directory. -+ */ -+ -+#ifndef PPC_HOST_SIGNAL_H -+#define PPC_HOST_SIGNAL_H -+ -+/* The third argument to a SA_SIGINFO handler is ucontext_t. */ -+typedef ucontext_t host_sigcontext; -+ -+static inline uintptr_t host_signal_pc(host_sigcontext *uc) -+{ -+ return uc->uc_mcontext.regs->nip; -+} -+ -+static inline void host_signal_set_pc(host_sigcontext *uc, uintptr_t pc) -+{ -+ uc->uc_mcontext.regs->nip = pc; -+} -+ -+static inline void *host_signal_mask(host_sigcontext *uc) -+{ -+ return &uc->uc_sigmask; -+} -+ -+static inline bool host_signal_write(siginfo_t *info, host_sigcontext *uc) -+{ -+ return uc->uc_mcontext.regs->trap != 0x400 -+ && (uc->uc_mcontext.regs->dsisr & 0x02000000); -+} -+ -+#endif diff --git a/linux-user/signal.c b/linux-user/signal.c index 092e70b..b8dfa8a 100644 --- a/linux-user/signal.c diff --git a/srcpkgs/qemu/template b/srcpkgs/qemu/template index 48ab199e5686..56e60f340b57 100644 --- a/srcpkgs/qemu/template +++ b/srcpkgs/qemu/template @@ -1,8 +1,8 @@ # Template file for 'qemu' # This package should be updated together with qemu-user-static pkgname=qemu -version=7.1.0 -revision=2 +version=8.0.0 +revision=1 build_style=configure configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --localstatedir=/var --disable-glusterfs --disable-xen --enable-docs --enable-kvm --enable-libusb --enable-pie @@ -10,7 +10,7 @@ configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --loca --audio-drv-list=alsa$(vopt_if sdl2 ,sdl)$(vopt_if jack ,jack)$(vopt_if pulseaudio ,pa) $(vopt_enable opengl) $(vopt_enable pulseaudio pa) $(vopt_enable sdl2 sdl) $(vopt_enable smartcard) $(vopt_enable spice) $(vopt_enable virgl virglrenderer) $(vopt_if gtk3 '--enable-gtk')" -hostmakedepends="gettext pkg-config perl python3 python3-Sphinx python3-sphinx_rtd_theme ninja" +hostmakedepends="flex gettext pkg-config perl python3 python3-Sphinx python3-sphinx_rtd_theme ninja" makedepends="capstone-devel dtc-devel libpng-devel libjpeg-turbo-devel pixman-devel snappy-devel libuuid-devel libX11-devel alsa-lib-devel libaio-devel gnutls-devel libsasl-devel libglib-devel ncurses-devel libseccomp-devel nss-devel @@ -28,7 +28,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.qemu.org" distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2" -checksum=f7ac2b85b3f1831e6810b140306e30af91556e15784864b209f3942858947fd0 +checksum=435915e292a3e77bbad4bc38c9321d69bbf66fe470b203f082b2db673fc066f2 ignore_elf_dirs="/usr/share/qemu" nostrip_files="hppa-firmware.img openbios-ppc openbios-sparc32 openbios-sparc64 palcode-clipper s390-ccw.img s390-netboot.img u-boot.e500 opensbi-riscv32-generic-fw_dynamic.elf From cafca2e9409171c29dc4ac8707221ecf43625ec5 Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Fri, 16 Dec 2022 17:33:11 +1100 Subject: [PATCH 2/2] qemu-user-static: update to 8.0.0. --- srcpkgs/qemu-user-static/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/qemu-user-static/template b/srcpkgs/qemu-user-static/template index 2a8da9b53f2d..304cab060649 100644 --- a/srcpkgs/qemu-user-static/template +++ b/srcpkgs/qemu-user-static/template @@ -1,20 +1,20 @@ # Template file for 'qemu-user-static' # This package should be updated together with qemu pkgname=qemu-user-static -version=7.1.0 -revision=3 +version=8.0.0 +revision=1 build_style=configure configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --disable-kvm --disable-png --disable-virtfs --disable-fdt --disable-seccomp --enable-linux-user --disable-system --static --disable-pie" -hostmakedepends="pkg-config perl python3 ninja" +hostmakedepends="flex pkg-config perl python3 ninja" makedepends="dtc-devel libglib-devel pixman-devel libuuid-devel" short_desc="QEMU User-mode emulators (statically compiled)" maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.qemu.org" distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2" -checksum=f7ac2b85b3f1831e6810b140306e30af91556e15784864b209f3942858947fd0 +checksum=435915e292a3e77bbad4bc38c9321d69bbf66fe470b203f082b2db673fc066f2 _fmts="aarch64 aarch64_be alpha arm armeb cris hppa i386 m68k microblaze microblazeel mips mipsel mips64 mips64el mipsn32 mipsn32el or1k