From nobody Wed Apr 24 05:06:18 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 4VPRlt6t2jz5JnJJ; Wed, 24 Apr 2024 05:06:18 +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 4VPRlt424zz4TMJ; Wed, 24 Apr 2024 05:06:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713935178; 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=XTYz+v8EHfjIKUa516xwDRihbOR024Wjpp8l/jvEW4M=; b=BASIke1HnXgcQZaAJDrdN9IcMevDvHUUxRHcTCCnF1b3OvZi0c4J5tK3/o98livpwMrkPo mWfXr43kVqR0p1Zav/+0iKDiONOPFySQOJe701eDU6qQByuyoEAQCgtfsIbip/D5YYiper 6FdsUhVBG6kRhqFx+Kx0ySq7uAPNcXJNf8gRxRTUeUdtVsIU4TGCqSFTxvGY8BUR/hlbVI d4YfrP1LGUOmtxaGeZl+A2SIxdrM+NHK6YVmDWua5P0q09BAKD9KD+zs3ULn5voUmris8r 7/7JBNRKJ3svL+2MRJ6A3GwY5+9om46heeWQqRIIaPb6gC7ihJByAAXwSq4L0w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713935178; a=rsa-sha256; cv=none; b=ute4sAhgUf1w5pZ948uhWXX8gZsmR0DD5NUSE7PEPRCazgToWOXgX49u+0n7OkfetOHtIS yGWoqpQOcWMawLtxzQmiJZW8xKcQCEzjnx3Uv9LZFx+Fdj+Z7mrTJgXCCxHT+a1hEQuhzc A0XH7gtP1IzeTVreoi9ffeeZwlBtEqb1I+raIv+PXSuUG03gz8RAMcZpjMzV8ZsEZgXCvh +o1WYfmasa1RfEcVRlNfOwswSTbtKutqQyZaJblgdsIPFv1xq9e/sCJis4CEHTLG7hErCg syzRvcKhXTkGOJK6kDcdGz3tNLJ6Trc6S+yrMQdkW5bNnMQ1XN0yyq/6pV0kiw== 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=1713935178; 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=XTYz+v8EHfjIKUa516xwDRihbOR024Wjpp8l/jvEW4M=; b=ai4iRZjQiEWPDFJ85EAcdXHsO8k6Nt6PGFwX/ZuzyYpywO2T7FvDLDGDBQW+Gq2nXhYmW7 Wb2BYmgbz7+XAdYW70sQ4yuK1xY313ktlKTqrdssxo9fs1DHzVgtCjz0kTJB9W4P1VEnt2 PMyfp0jvNf5/m0UblUuCSH2CI+kE8wR51jgbZXCovsDSr2nhvJHhvyBDEalhADvsNMLz5d BEk4yotJGU1JTm1hgfuLh4qtMKXxGK5meFJ/uLj4lzMxQ+mjU3862jl0ZJ/Damz4aD1DdD CcLL8iQsQnAWrjY8Gm5NbB8y1f5T+upV5N/izm6DsxKTaCmBZH4V5LNbvpFCvQ== 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 4VPRlt3f62z121f; Wed, 24 Apr 2024 05:06:18 +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 43O56Itb023967; Wed, 24 Apr 2024 05:06:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43O56IWx023964; Wed, 24 Apr 2024 05:06:18 GMT (envelope-from git) Date: Wed, 24 Apr 2024 05:06:18 GMT Message-Id: <202404240506.43O56IWx023964@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 1b0e8598970d - stable/13 - 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/13 X-Git-Reftype: branch X-Git-Commit: 1b0e8598970dd98eb9248d4f29bb8738abb11eb4 Auto-Submitted: auto-generated The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=1b0e8598970dd98eb9248d4f29bb8738abb11eb4 commit 1b0e8598970dd98eb9248d4f29bb8738abb11eb4 Author: Colin Percival AuthorDate: 2024-04-11 16:24:59 +0000 Commit: Colin Percival 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