From nobody Wed Apr 17 05:43:56 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 4VK8wX2xKfz5Hv5G; Wed, 17 Apr 2024 05:43:56 +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 4VK8wX1CbFz4l78; Wed, 17 Apr 2024 05:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713332636; 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=dewWY+XVDlFKX6q6CdaNuSZboYcEoaeGA2oXi2bJ1nY=; b=IBq9zY41Eht8pXt4MXQ55OiumvmaOXno86jCO1tuKVXxw92bYbrJSK3vmksAR3W6sS3DC/ BGA3HBoNN4hAWws3Fj+lfp0+PZ1ehYngKW9boJFwKrlUXBHSR+RGrHxjoqLJBboA2meLQ4 vm3+bhLqFQpOVqeJSLFgI4Bn3dEy3WsRkvU7SK3rkYpG7/bRJlqH8+4WX57s0uLAeUzuCZ Ej4n3aLLq44YlR89uMNVrguKgxMFIlnBpChHv0AYO219PmIC3jh3IqMVRQ/GB9fA+XX+QO T3AZsdm0d1fxuxMC8KEa7g3Lm4Mxq1ryofnlX/YkDz+zFx35T85GtPjzwDlVMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713332636; a=rsa-sha256; cv=none; b=UD+rQ/MRORrdz1DOqKPwLksK2LT9g8Fm6wFbKyYuNghmNRbkgYmOoQzwGRN1yOQbg1LPF8 IjpGezUjxD72XyDUxmmKpe/QEgRGhZdv223AOHzP7v6zAipQv1rqf6/sIKfOtI3PqHIa11 5+NZlowEZIRQYrGmtkjn64dT7EQalg53GTLeeUrI4YdsY9ED8xPeVU1+4CHWi9pRER2Htg Vj7nYincozqT+D0sNbw6SdfqmdyiFnv/LaK8zQv+Y13tkNFiBcu+INWd5sTCnfOw3MXcFt wh7FxbYGSrEnJcRNryPOE76IJfMAKWgTApu5ksahDJWwacDJjzMUcpvQlXeXAQ== 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=1713332636; 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=dewWY+XVDlFKX6q6CdaNuSZboYcEoaeGA2oXi2bJ1nY=; b=TQjhp0nC2aK8rkj9lPoAEGJmVhQN6sgzHRw7dC6HoMzc1HFWDz/cH2QyedV+C3WMoF+fe+ gKE5o5vvPyYNEnmSxWkT1twrvkrIa5QK/Ewo1ELMghuP1q87TjtC5NMqSsXt8RiLOCJ+uN Q9znluiwfPFEdzqRU0NvTRRC5c0t4fgUhqhthUeiyZG2iqt8vqKWCV2JhWyESaIoMD/PT2 W31s/k4ro+nnDfJEzcT91j2UEvjRyWx1Ab1w0dNCxd3L7nINWZEjdgdF4VAGrHmu4SqTtD J7VhmTA2H0fi/6aI5HWWU4ppETLs/oilg4EK/l/iB/X+nHB8SVaQVRKVvh2tuQ== 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 4VK8wX0r4DzDs2; Wed, 17 Apr 2024 05:43:56 +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 43H5hugf006756; Wed, 17 Apr 2024 05:43:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H5huDC006753; Wed, 17 Apr 2024 05:43:56 GMT (envelope-from git) Date: Wed, 17 Apr 2024 05:43:56 GMT Message-Id: <202404170543.43H5huDC006753@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: ffddfd3631de - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: ffddfd3631de5b4104af5e0ee1331508ea2a46f3 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=ffddfd3631de5b4104af5e0ee1331508ea2a46f3 commit ffddfd3631de5b4104af5e0ee1331508ea2a46f3 Author: Colin Percival AuthorDate: 2024-04-11 16:24:59 +0000 Commit: Colin Percival CommitDate: 2024-04-17 05:43:27 +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 a936e6cb98ca..54fee60b2e22 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