Date: Sun, 2 Jun 2024 14:07:59 GMT From: Colin Percival <cperciva@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: e50fec56bfa2 - main - Revert "release/Makefile.vm: Use qemu-user-static-devel" Message-ID: <202406021407.452E7x24075682@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e50fec56bfa2c9673417513062de5969307fe8ed commit e50fec56bfa2c9673417513062de5969307fe8ed Author: Colin Percival <cperciva@FreeBSD.org> AuthorDate: 2024-06-02 14:07:03 +0000 Commit: Colin Percival <cperciva@FreeBSD.org> CommitDate: 2024-06-02 14:07:52 +0000 Revert "release/Makefile.vm: Use qemu-user-static-devel" This breaks the weekly snapshot builds. We'll try again once Warner has some time to debug the qemu-user-static-devel port. This reverts commit a04ecddfc721427fd97fd1fcc27492ebd19ad183. --- release/Makefile.vm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index b5c1470a6eac..548b4c1cca3b 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -75,16 +75,16 @@ ${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo emulator-portinstall: .if !exists(/usr/local/bin/qemu-${TARGET_ARCH}-static) -.if exists(${PORTSDIR}/emulators/qemu-user-static-devel/Makefile) +.if exists(${PORTSDIR}/emulators/qemu-user-static/Makefile) env - UNAME_r=${UNAME_r} PATH=$$PATH \ - make -C ${PORTSDIR}/emulators/qemu-user-static-devel \ + make -C ${PORTSDIR}/emulators/qemu-user-static \ BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ all install clean .else .if !exists(/usr/local/sbin/pkg-static) env ASSUME_ALWAYS_YES=yes pkg bootstrap -y .endif - env ASSUME_ALWAYS_YES=yes pkg install -y emulators/qemu-user-static-devel + env ASSUME_ALWAYS_YES=yes pkg install -y emulators/qemu-user-static .endif .endif touch ${.TARGET}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406021407.452E7x24075682>