hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-11 04:42:16 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "release/Makefile.vm: Use qemu-user-static-devel"

Browse Source 
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 a04ecddfc7.
This commit is contained in:
Colin Percival 2024-06-02 07:07:03 -07:00
parent 077f757d72
commit e50fec56bf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
release/Makefile.vm
View File

@ -75,16 +75,16 @@ ${_V}!= eval $$(awk '/^${_V}=/{print}' ${.CURDIR}/../sys/conf/newvers.sh); echo
emulator-portinstall: emulator-portinstall:
.if !exists(/usr/local/bin/qemu-${TARGET_ARCH}-static) .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 \ 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 \ BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \
all install clean all install clean
.else .else
.if !exists(/usr/local/sbin/pkg-static) .if !exists(/usr/local/sbin/pkg-static)
env ASSUME_ALWAYS_YES=yes pkg bootstrap -y env ASSUME_ALWAYS_YES=yes pkg bootstrap -y
.endif .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
.endif .endif
touch ${.TARGET} touch ${.TARGET}