From nobody Wed Apr 17 05:43:58 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 4VK8wZ5YCdz5Hv9S; Wed, 17 Apr 2024 05:43:58 +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 4VK8wZ2tfhz4lMJ; Wed, 17 Apr 2024 05:43:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713332638; 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=YntBxYJb2jltYmJ4lL417NfSzTZpu+rL1wYP4bY6XAI=; b=JecsBllzTdwyiZ5K0mfxOBGpqr0KGschuFBgND8NYGcFPtj4vkObrKaEIEwo1fGiBAxo4U Aeo+5IGr9IIl3KuZNG8pZ8+ZlsUKNchvgi+FNITzA0MblCBIcs5x6QzZjT0YyDzRoDTt6x uIBxdvfq8LBnt1CLoBGCZ6A34sZ++4mNulNgrH455ubiioz5S5nyeQMGDg2YHlzraBSRs7 /xA/aDM1yPSRD1cHfpI+mDRpXLCPRZbMEbeMdayRiLosh+j2TmXHP5SO0CbTE2UHCWmB2k +b9/TTNoAGU1sT7i1w4krjYuy+mkgxRRbSkshDybLY7a7GPsqpM+hg2TM/6L4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713332638; a=rsa-sha256; cv=none; b=v5cC2cy757etRp8tLm/OztW0/IUYeC6hz7PtXCm74x5enwnqWdalU5zQTMT0PO4jJZvoop AZufBfQ6EYa0LYpDqAyV7HDWCYSLmS/HaNx6mgb47+25eY4taduZFsE0D4zXHwNrG9sXdg nJhdSPN+57SGceBovDX8GXssNpM81Go6JXBN6H86cRF/pDp/uBEwTfFb39SYKCzWp4jD5C 6dMDTW0Nch72D+pESHIW8jcNk52O/A8dTTrl14mJxB+rptI3CMCPaCK1a6YHtRY4ffXrMx kWvbjswRSYKDY0jzPTdKCSqFP8IFQLxf6Ci3JZTUWLQeH1JDzbRAbJ753Xoq8w== 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=1713332638; 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=YntBxYJb2jltYmJ4lL417NfSzTZpu+rL1wYP4bY6XAI=; b=nZFcweiFlQopg/4T76IE4quWT+ZftmwQxX9rtQLKL5dr7jrSTO+FfY49DlkxL7WGVJtZHR KGrUtjoJ6MCGh08LLERMr4P/WxKOspQawxgulan4XRuvd/yl3RLAL7bbtWcNCteq5RFlS6 SiXL8bBQ1Zy6s2m/gPfbTGuma9vpowkuelLJUgyPCI9XV1us7bgULYKeYhPnCqOaRVwTlu A8EnIRthn3XKA8k7szGABmSZOWKS7M/goTaTtArtk4maMJvl4A6MzdFGf4XcrIO97RHZeV r+Qd+uhOlDcGX2nnxJvEniZ4+XCjNedQRRi/i6C+bDqQoHFFMyT0WUNLA1cVlA== 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 4VK8wZ2Vw1zFBt; Wed, 17 Apr 2024 05:43:58 +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 43H5hwlS006851; Wed, 17 Apr 2024 05:43:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H5hwtB006848; Wed, 17 Apr 2024 05:43:58 GMT (envelope-from git) Date: Wed, 17 Apr 2024 05:43:58 GMT Message-Id: <202404170543.43H5hwtB006848@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: 5f2695943de6 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 5f2695943de6debefe05d387a19d36ac47e281f1 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=5f2695943de6debefe05d387a19d36ac47e281f1 commit 5f2695943de6debefe05d387a19d36ac47e281f1 Author: Colin Percival AuthorDate: 2024-04-12 17:20:25 +0000 Commit: Colin Percival CommitDate: 2024-04-17 05:43:27 +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 a8f59282a09c..36f3f8715de1 100644 --- a/release/Makefile.azure +++ b/release/Makefile.azure @@ -37,7 +37,9 @@ azure-check-depends: . endif env ASSUME_ALWAYS_YES=yes pkg install -y sysutils/py-azure-cli . else - env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/sysutils/py-azure-cli BATCH=1 all install clean + env UNAME_r=${UNAME_r} make -C ${PORTSDIR}/sysutils/py-azure-cli \ + BATCH=1 WRKDIRPREFIX=/tmp/ports DISTDIR=/tmp/distfiles \ + all install clean . endif .endif diff --git a/release/Makefile.ec2 b/release/Makefile.ec2 index c674c967ff57..8f5f6f205779 100644 --- a/release/Makefile.ec2 +++ b/release/Makefile.ec2 @@ -40,13 +40,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 2bfdf4edc246..51dc5e3436e2 100644 --- a/release/Makefile.gce +++ b/release/Makefile.gce @@ -43,8 +43,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 bcfbf9a5a6f7..d8f3c14e9498 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