From nobody Wed Apr 24 05:06:19 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 4VPRlw3L5rz5Jnjm; Wed, 24 Apr 2024 05:06:20 +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 4VPRlv6fmtz4TK4; Wed, 24 Apr 2024 05:06:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713935179; 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=Erfajz4/e0GxRsp3ujoGLBxDaTQP167r35U5Qbo32MM=; b=Xl//2q81NXg7mdDQ9Ng2s3RD7vp5KSP1duSP5jFJ68FxetFSTYadepTK7RTB/SwOYho1HH jThrkaahVbw4HnI/E1t+7glM/DyLoMY9VtLLkOwNdhq2b+o2wbBx6q5H478pU1ZpO8IWYe 0fBF8BfabztJRSgivAaEF9TQjEV/8eKtkYDwWvfuDTfgM9S8JlmV0TwlFIpe27C/FHjcFj 0W1rSdMoYA/YbcS90mbZX5pheW5jLeP1XXdTOYQgCIMMKBFeoMDC0FidfCLu3KS9J9d84E TwXhsjyjhfD3wyOOOpHfbIYArn8GenWFS6Easc64y2UwCXvHhoQ3o75E2QG7ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713935179; a=rsa-sha256; cv=none; b=Tt825Tx2nlAU5eF41mLYPFzW4oSRdvosBZmd1Uut2pQBqF/sTUTiyO5TSugeyWoxEKS167 xvnJrlhVpp4fLY9Njz1Dsqkp3TxM0eSkmBjqW444Ryet2bIZjcYpJ5M07afwVX9qyNP3qJ ksRnhQKhFyEcaeC65DvC9DJsPqzhG4KHAJ3Ew1PPAJt+iib1MSgj5H8lBgS6iAZMXGhAYt mKRgLPX/ppU85WmtoozKRAiA1OXJal8lm75TTZC1638TeGzkNdBDNH6XLbRdo2y1mL/WJP kUY25gzx/Fde+Na0tT2HubUtTo5YRAntFwS1hZtgxsfeQCaK0VJiVBN3TlvP1g== 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=1713935179; 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=Erfajz4/e0GxRsp3ujoGLBxDaTQP167r35U5Qbo32MM=; b=LEdUk3edqQOzl/WG+TmnaTDTUZIdau8/RnVhiOy9DKOxgv1O6IRrfZU0OL62pPMoe73Gan /yUNo7vA20WWKbMPzgeO3b6bcYohf3oAbDF2mmMoA9DdCY27Y7NZyBJJLf/Uwyb1zX/J+m biZ5F9FbOt8RJxnN709Pb4JevF+QvogSWfcks3Ifpbc1+KGzOCIJn1q0Po/I9T6cgiGzuG elY/FRZBp1p+QOQtU3gwR80pVfUX33triMlQmSC24+YdxBVzva74Ou2Gvq45TnH5NGZ9CM 1Zrr+zW4hxNOz8KmNmiP85mSUU2giuvcRwBtBpT5xMON2sxci3/7f6HNTyTfxQ== 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 4VPRlv4dLXz11ry; Wed, 24 Apr 2024 05:06:19 +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 43O56JLv024012; Wed, 24 Apr 2024 05:06:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43O56J2G024010; Wed, 24 Apr 2024 05:06:19 GMT (envelope-from git) Date: Wed, 24 Apr 2024 05:06:19 GMT Message-Id: <202404240506.43O56J2G024010@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: 6b8ca8c4e406 - stable/13 - release: Support r/o /usr/ports for cloudware 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: 6b8ca8c4e40635ef7bd62e20d014c79f017b0e7e Auto-Submitted: auto-generated The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=6b8ca8c4e40635ef7bd62e20d014c79f017b0e7e commit 6b8ca8c4e40635ef7bd62e20d014c79f017b0e7e Author: Colin Percival AuthorDate: 2024-04-12 17:20:25 +0000 Commit: Colin Percival CommitDate: 2024-04-24 05:04:06 +0000 release: Support r/o /usr/ports for cloudware Set WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles when building tools needed for uploading cloudware images. While I'm here, adjust the bsdec2-image-upload build target to match the style used by the Azure/GCE/Vagrant Makefiles. MFC after: 3 days (cherry picked from commit 6c87aed39c3053cd338c1ec18fba5b1d773beca9) --- release/Makefile.azure | 4 +++- release/Makefile.ec2 | 16 ++++++++++------ release/Makefile.gce | 8 ++++++-- release/Makefile.vagrant | 4 +++- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/release/Makefile.azure b/release/Makefile.azure index 19d571de9f44..0f63acb0046b 100644 --- a/release/Makefile.azure +++ b/release/Makefile.azure @@ -38,7 +38,9 @@ azure-check-depends: . endif env ASSUME_ALWAYS_YES=yes pkg install -y www/npm . else - env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/www/npm BATCH=1 all install clean + env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/www/npm \ + BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ + all install clean . endif . endif npm install -g azure-cli diff --git a/release/Makefile.ec2 b/release/Makefile.ec2 index 51d32ecd97a6..20a5ae23ac3b 100644 --- a/release/Makefile.ec2 +++ b/release/Makefile.ec2 @@ -43,13 +43,17 @@ CW_EC2_PORTINSTALL= .endif cw-ec2-portinstall: -.if exists(${PORTSDIR}/net/bsdec2-image-upload/Makefile) - env - UNAME_r=${UNAME_r} PATH=$$PATH make -C ${PORTSDIR}/net/bsdec2-image-upload BATCH=1 all install clean -.else -. if !exists(/usr/local/sbin/pkg-static) - env ASSUME_ALWAYS_YES=yes pkg bootstrap -y -. endif +.if !exists(/usr/local/bin/bsdec2-image-upload) +. if !exists(${PORTSDIR}/net/bsdec2-image-upload/Makefile) +. if !exists(/usr/local/sbin/pkg-static) + env ASSUME_ALWAYS_YES=yes pkg bootstrap -yf +. endif env ASSUME_ALWAYS_YES=yes pkg install -y net/bsdec2-image-upload +. else + env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/net/bsdec2-image-upload \ + BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ + all install clean +. endif .endif @touch ${.TARGET} diff --git a/release/Makefile.gce b/release/Makefile.gce index ea5daf290e3c..c6c19961b673 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -48,8 +48,12 @@ gce-check-depends: env ASSUME_ALWAYS_YES=yes pkg install -y net/google-cloud-sdk \ lang/python . else - env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/net/google-cloud-sdk BATCH=1 all install clean - env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/lang/python BATCH=1 all install clean + env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/net/google-cloud-sdk \ + BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ + all install clean + env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/lang/python \ + BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ + all install clean . endif .endif diff --git a/release/Makefile.vagrant b/release/Makefile.vagrant index 5fd2c31e9f49..cc72f7456740 100644 --- a/release/Makefile.vagrant +++ b/release/Makefile.vagrant @@ -57,7 +57,9 @@ vagrant-check-depends: . endif env ASSUME_ALWAYS_YES=yes pkg install -y curl . else - env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/ftp/curl BATCH=1 all install clean + env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/ftp/curl \ + BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ + all install clean . endif .endif