git: 6f454c211b29 - main - release/Makefile.vm: Support read-only ports tree
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 11 Apr 2024 16:28:11 UTC
The branch main has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=6f454c211b295ad13e80fc5b858efc9bad33e33b
commit 6f454c211b295ad13e80fc5b858efc9bad33e33b
Author: Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2024-04-11 16:24:59 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2024-04-11 16:28:05 +0000
release/Makefile.vm: Support read-only ports tree
Build qemu (if needed) with WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles
so that we can have a read-only /usr/ports and don't contaminate it. This
became an issue when I enabled parallel release building, since one image
might be creating its ports.txz file at the same time as we're building
qemu as a prerequisite for building another image.
MFC after: 5 days
---
release/Makefile.vm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/release/Makefile.vm b/release/Makefile.vm
index a52e3b9bac81..de73749f1985 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -76,7 +76,10 @@ ${_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/Makefile)
- env - UNAME_r=${UNAME_r} PATH=$$PATH make -C ${PORTSDIR}/emulators/qemu-user-static BATCH=1 all install clean
+ env - UNAME_r=${UNAME_r} PATH=$$PATH \
+ 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