Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 24 Apr 2024 05:06:18 GMT
From:      Colin Percival <cperciva@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 1b0e8598970d - stable/13 - release/Makefile.vm: Support read-only ports tree
Message-ID:  <202404240506.43O56IWx023964@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=1b0e8598970dd98eb9248d4f29bb8738abb11eb4

commit 1b0e8598970dd98eb9248d4f29bb8738abb11eb4
Author:     Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2024-04-11 16:24:59 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2024-04-24 05:02:02 +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
    
    (cherry picked from commit 6f454c211b295ad13e80fc5b858efc9bad33e33b)
---
 release/Makefile.vm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/release/Makefile.vm b/release/Makefile.vm
index 27053208c689..2e5bdb9a7004 100644
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -55,7 +55,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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202404240506.43O56IWx023964>