diff --git a/srcpkgs/qemu-user-cris b/srcpkgs/qemu-user-cris deleted file mode 120000 index 62973fbc055..00000000000 --- a/srcpkgs/qemu-user-cris +++ /dev/null @@ -1 +0,0 @@ -qemu-user \ No newline at end of file diff --git a/srcpkgs/qemu-user/template b/srcpkgs/qemu-user/template index eaa6beeb687..63eabb622ee 100644 --- a/srcpkgs/qemu-user/template +++ b/srcpkgs/qemu-user/template @@ -1,21 +1,21 @@ # Template file for 'qemu-user' # This package should be updated together with qemu pkgname=qemu-user -version=9.1.2 +version=9.2.0 revision=1 build_style=meta configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec --enable-linux-user --disable-system --static -Dkvm=disabled -Dpng=disabled -Dvirtfs=disabled -Dfdt=disabled -Dseccomp=disabled -Dtools=disabled" -hostmakedepends="meson flex glib-devel pkg-config perl" +hostmakedepends="meson flex glib-devel pkg-config perl python3-pycotap" makedepends="dtc-devel glib-devel pixman-devel libuuid-devel" short_desc="QEMU user-mode emulators" maintainer="classabbyamp " license="GPL-2.0-only, LGPL-2.1-only" homepage="https://www.qemu.org" distfiles="https://wiki.qemu.org/download/qemu-${version}.tar.bz2" -checksum=d717acc2a52bbea72ea7283bca3292288f16ac510699fb02e112f6326f43daea +checksum=7954be7a779bafb97e20e31da19473437d6e9d461e4adda9bb7acfef55d813f5 subpackages="qemu-user-static" if [ "$CROSS_BUILD" ]; then @@ -28,7 +28,6 @@ _archs=( alpha arm armeb - cris hexagon hppa i386 @@ -73,6 +72,8 @@ done . /void-packages/common/build-style/configure.sh 2>/dev/null +export PYTHONUNBUFFERED=1 + _user_tmpl() { _arch="$1" _binfmt="$2" @@ -84,6 +85,11 @@ _user_tmpl() { } } +post_extract() { + # remove vendored wheels, these should come from (host)makedepends + rm -r python/wheels +} + post_install() { # provided by qemu rm -rf ${DESTDIR}/etc ${DESTDIR}/usr/share ${DESTDIR}/usr/libexec ${DESTDIR}/usr/include