From nobody Thu Apr 11 16:28:11 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VFlVg4FZGz5Hgnl; Thu, 11 Apr 2024 16:28:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VFlVg3mf1z4GYx; Thu, 11 Apr 2024 16:28:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712852891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AkrU5RKpX/da8lJx10zUb3l+PHH95P0U6htD2PTkiPM=; b=cgchABrywnPg641ipXC9RnjJJfGZvt738ltBi+nBjEqNdDDiblOKcgQ85Pulk20trgyI7F IzctpU/CBEJ/Gn6zl57G5/LwQLNKIsmplc3yhRmLSxBwHTB/aSFmH9/SH8J41+NUfI6c9H nE1XgFKHjevGWcBaEKSt9epGBrCzhgDYXEbECex23biNvyFv/jefoYMYUxR1OnTZyjXP2M VWWJaXqwxUE9bk5WywLSP1wwD8ocuNAVDyxtnqBxWBF8yiV+4W9WKETnvXtmNq94CSTF0j V9/czEtzeEOdYvdyfNVIH2kcfGZoxYf/uAcrwxIaCL/ZwVWJUzjlY0CQ3GDyzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712852891; a=rsa-sha256; cv=none; b=Tlvee1S91o4rm42IbPuqn2b9jezEpxhQczYEBm4MewiZIo3NjrkPEiNbW3QAxZ0VLfX1GA 7Mn8riAN8R2MEXzsB6XGTeXyrl8b1qk2B4E4LcE6YieFF1i4m6UdkGwIP8YWRfN0rMLTDw 1PiwB+yV8q/HX2Diy81Cc/uFI7GsRaAyL2jAqMvJUXMuY9uQVfITR6Ni7uD37pE34rdXPq A/NXAtqPLzb3UX+pWVeA+bO4J8BoZ1R1TfT9jDO8riMq+aooN1QnkqFBLKfQTXiZBy7aSh vrAjaq1BIz03FVHOmECErYPariyBwbQSpIfITd+y/eQn4nCSjpVUTRBbi3Yh5A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712852891; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AkrU5RKpX/da8lJx10zUb3l+PHH95P0U6htD2PTkiPM=; b=sCulq2gtYS3mKb+6yeUQM4ceyill6Fz/u9nwmafTHsqcAdaA2lsKA4F7YmdrCM0jZdkz3h Z4JmEhnFYZu3K+GeIb/r35eXyoSGS6Vi33NXWpaAlG0Y+bc5yn7EYrrw/TDDKaePAv4j63 8rPCiPDA/tER6/+ruZzr5bGSm/BrnO88NbVOWAGqAmK3/s59sG7LXizYPsX9GRIzft0T4f F2HyiGbBl6jbM9WDRHwBsmE4Xt9Cl5M0wXRua3uvbC548zMvAiwnLFt895PnMczeppF0qS kmnPS5yVwu3vSexvB++JtRYoPtuxrdsWTEgdm1tJ9f+pps/axvttQe/LAERGQQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VFlVg3NDgz1SB4; Thu, 11 Apr 2024 16:28:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43BGSBYU051765; Thu, 11 Apr 2024 16:28:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43BGSBQV051762; Thu, 11 Apr 2024 16:28:11 GMT (envelope-from git) Date: Thu, 11 Apr 2024 16:28:11 GMT Message-Id: <202404111628.43BGSBQV051762@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 6f454c211b29 - main - release/Makefile.vm: Support read-only ports tree List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: dev-commits-src-all+owner@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6f454c211b295ad13e80fc5b858efc9bad33e33b Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6f454c211b295ad13e80fc5b858efc9bad33e33b commit 6f454c211b295ad13e80fc5b858efc9bad33e33b Author: Colin Percival AuthorDate: 2024-04-11 16:24:59 +0000 Commit: Colin Percival 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