qemu-user-static: update to 9.1.0, split emulators, rename to qemu-user

2024-08-12 19:59:56 -04:00 · 2024-08-12 19:59:56 -04:00 · ec662ff61f
parent 7c2c822fe8
commit ec662ff61f
39 changed files with 139 additions and 41 deletions
--- a/srcpkgs/qemu-user-aarch64
+++ b/srcpkgs/qemu-user-aarch64
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-aarch64_be
+++ b/srcpkgs/qemu-user-aarch64_be
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-alpha
+++ b/srcpkgs/qemu-user-alpha
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-amd64
+++ b/srcpkgs/qemu-user-amd64
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-arm
+++ b/srcpkgs/qemu-user-arm
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-armeb
+++ b/srcpkgs/qemu-user-armeb
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-cris
+++ b/srcpkgs/qemu-user-cris
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-hexagon
+++ b/srcpkgs/qemu-user-hexagon
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-hppa
+++ b/srcpkgs/qemu-user-hppa
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-i386
+++ b/srcpkgs/qemu-user-i386
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-loongarch64
+++ b/srcpkgs/qemu-user-loongarch64
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-m68k
+++ b/srcpkgs/qemu-user-m68k
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-microblaze
+++ b/srcpkgs/qemu-user-microblaze
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-microblazeel
+++ b/srcpkgs/qemu-user-microblazeel
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-mips
+++ b/srcpkgs/qemu-user-mips
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-mips64
+++ b/srcpkgs/qemu-user-mips64
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-mips64el
+++ b/srcpkgs/qemu-user-mips64el
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-mipsel
+++ b/srcpkgs/qemu-user-mipsel
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-mipsn32
+++ b/srcpkgs/qemu-user-mipsn32
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-mipsn32el
+++ b/srcpkgs/qemu-user-mipsn32el
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-or1k
+++ b/srcpkgs/qemu-user-or1k
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-ppc
+++ b/srcpkgs/qemu-user-ppc
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-ppc64
+++ b/srcpkgs/qemu-user-ppc64
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-ppc64le
+++ b/srcpkgs/qemu-user-ppc64le
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-riscv32
+++ b/srcpkgs/qemu-user-riscv32
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-riscv64
+++ b/srcpkgs/qemu-user-riscv64
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-s390x
+++ b/srcpkgs/qemu-user-s390x
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-sh4
+++ b/srcpkgs/qemu-user-sh4
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-sh4eb
+++ b/srcpkgs/qemu-user-sh4eb
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-sparc
+++ b/srcpkgs/qemu-user-sparc
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-sparc32plus
+++ b/srcpkgs/qemu-user-sparc32plus
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-sparc64
+++ b/srcpkgs/qemu-user-sparc64
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-static
+++ b/srcpkgs/qemu-user-static
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-static/template
+++ b/srcpkgs/qemu-user-static/template
@ -1,41 +0,0 @@
-# Template file for 'qemu-user-static'
-# This package should be updated together with qemu
-pkgname=qemu-user-static
-version=9.0.2
-revision=2
-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="flex glib-devel pkg-config perl python3 ninja"
-makedepends="dtc-devel glib-devel pixman-devel libuuid-devel"
-short_desc="QEMU User-mode emulators (statically compiled)"
-maintainer="classabbyamp <void@placeviolette.net>"
-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=6fef38a497ff65f8d45c611b12ed5f5bb3e19ea6d76bfaea6857bf6fd76701e6
-
-if [ "$CROSS_BUILD" ]; then
-	configure_args+=" --cross-prefix=${XBPS_CROSS_TRIPLET}-"
-fi
-
-post_install() {
-	# Remove unneeded stuff.
-	rm -rf ${DESTDIR}/etc ${DESTDIR}/usr/share ${DESTDIR}/usr/libexec
-	for f in nbd io img; do
-		rm -f ${DESTDIR}/usr/bin/qemu-${f}
-	done
-	for f in ${DESTDIR}/usr/bin/*; do
-		mv ${f} ${f}-static
-	done
-
-	vmkdir usr/share/binfmts
-	HOST_ARCH="${XBPS_TARGET_MACHINE%-musl}" scripts/qemu-binfmt-conf.sh --debian \
-		--exportdir "${DESTDIR}"/usr/share/binfmts --qemu-path /usr/bin \
-		--preserve-argv0 yes --persistent yes --credential yes
-	for bf in "${DESTDIR}"/usr/share/binfmts/*; do
-		vsed -i -e "s/${bf##*/}/&-static/g" "$bf"
-		mv "$bf" "${bf}-static"
-	done
-}
--- a/srcpkgs/qemu-user-xtensa
+++ b/srcpkgs/qemu-user-xtensa
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-xtensaeb
+++ b/srcpkgs/qemu-user-xtensaeb
@ -0,0 +1 @@
+qemu-user
--- a/srcpkgs/qemu-user-static/patches
+++ b/srcpkgs/qemu-user-static/patches
--- a/srcpkgs/qemu-user/template
+++ b/srcpkgs/qemu-user/template
@ -0,0 +1,104 @@
+# Template file for 'qemu-user'
+# This package should be updated together with qemu
+pkgname=qemu-user
+version=9.1.0
+revision=1
+build_style=meta
+configure_args="--prefix=/usr --sysconfdir=/etc --libexecdir=/usr/libexec
+ --enable-linux-user --disable-system
+ -Dkvm=disabled -Dpng=disabled -Dvirtfs=disabled -Dfdt=disabled -Dseccomp=disabled
+ -Dtools=disabled"
+hostmakedepends="meson flex glib-devel pkg-config perl"
+makedepends="dtc-devel glib-devel pixman-devel libuuid-devel"
+short_desc="QEMU user-mode emulators"
+maintainer="classabbyamp <void@placeviolette.net>"
+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=a61859004b531189f28245edaf4ce7fd96402594a33c67f27bf0383fb6e83cb3
+subpackages="qemu-user-static"
+
+if [ "$CROSS_BUILD" ]; then
+	configure_args+=" --cross-prefix=${XBPS_CROSS_TRIPLET}-"
+fi
+
+_archs=(
+ aarch64
+ aarch64_be
+ alpha
+ arm
+ armeb
+ cris
+ hexagon
+ hppa
+ i386
+ loongarch64
+ m68k
+ microblaze
+ microblazeel
+ mips
+ mips64
+ mips64el
+ mipsel
+ mipsn32
+ mipsn32el
+ or1k
+ ppc
+ ppc64
+ ppc64le
+ riscv32
+ riscv64
+ s390x
+ sh4
+ sh4eb
+ sparc
+ sparc32plus
+ sparc64
+ x86_64
+ xtensa
+ xtensaeb
+)
+
+for _arch in "${_archs[@]}"; do
+	# bug in xbps: it hates package names ending in _N
+	_pkgname="qemu-user-${_arch//x86_64/amd64}"
+
+	subpackages+=" ${_pkgname}"
+	depends+=" ${_pkgname}>=${version}"
+
+	eval "${_pkgname}_package() {
+		_user_tmpl '$_arch'
+	}"
+done
+
+. /void-packages/common/build-style/configure.sh
+
+_user_tmpl() {
+	_arch="$1"
+	_binfmt="$2"
+	short_desc="QEMU ${_arch} user-mode emulator"
+	pkg_install() {
+		vmove "usr/bin/qemu-$_arch"
+		vmove "usr/bin/qemu-$_arch-static"
+		vmove "usr/share/binfmts/qemu-$_arch" || :
+	}
+}
+
+post_install() {
+	# provided by qemu
+	rm -rf ${DESTDIR}/etc ${DESTDIR}/usr/share ${DESTDIR}/usr/libexec ${DESTDIR}/usr/include
+	for f in ${DESTDIR}/usr/bin/*; do
+		ln -s ${f##*/} ${f}-static
+	done
+
+	vmkdir usr/share/binfmts
+	HOST_ARCH="${XBPS_TARGET_MACHINE%-musl}" scripts/qemu-binfmt-conf.sh --debian \
+		--exportdir "${DESTDIR}"/usr/share/binfmts --qemu-path /usr/bin \
+		--preserve-argv0 yes --persistent yes --credential yes
+}
+
+qemu-user-static_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
+}
--- a/srcpkgs/qemu-user-static/update
+++ b/srcpkgs/qemu-user-static/update