From nobody Thu May 8 16:46:33 2025 X-Original-To: dev-commits-src-main@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 4ZtdLx6dpyz5vK7L; Thu, 08 May 2025 16:46:33 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZtdLx6BDLz3bkB; Thu, 08 May 2025 16:46:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746722793; 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=vTFTNGz/cbtxiUFaQxhB3RFARF7tyTUV+2w8s5m4X2o=; b=GPOKWXwyztK5/7cp7VpAN0fRLPYHgdez/FmM19E4o2WF7jLc9xQc0DIIO4pFH/XIILRULT Je/pheJ2weyhlemd3WobdCtVNXqf0r06QEk+0Pi5N6on0pBtvkUnrPoj9+WZnA7oraMQ5V 4booSVVZMD+kYPnSMF2knw8s+xelnqOBS9wwOqbewhQjhfluyCJoi71iBiiszje5b1VL34 j4QtMudkTqgsdTLlsA+SkaZ1TwdqJJkgM8qP6dndLkWRbMsaNyQJX7JKP4lJaci48+j43G p3k25gMOSlY08eeUEjpzzgQ8OMkdn3INlTnCOY925w2/de0QjLM9+W9yti7EFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746722793; 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=vTFTNGz/cbtxiUFaQxhB3RFARF7tyTUV+2w8s5m4X2o=; b=WUnMja2BExocxyUKdaLGPEvK6mCiSkOycKW3iMrYowHWQHe7AVuVAfVcSW+N/cgWks98zx bwdsn6Z7b1VpPHMVzWqQJPwRWePyolxQKSn6jkS7wGsaqj/rSM/Sug6scU5/ottr+vb9iP hCxlv7afwwJN0HSsMWGh04n4xJNcCwL61M0ww4tUjoF9RW5Xq2F2mrBq64YfkpO8sZZC54 Ti7DG3+3lgzJeptcqLE28S4p0lXZcnrPxoz1CQFIfunazwY8ff0ihgFg1zpIEMVgsRxSy4 t0ENCmjIe4DgWuy6skF852Cs7Rql1zhCjpGkGmTzyvp9f9f/EtIQlVmMP57u4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746722793; a=rsa-sha256; cv=none; b=QuXBt19wR7W+ke8KQOuvas43hK78pb8vCVeDLj3eYBGKGJxzKMuiIIyI4oFFalJn2fvmnA cdcD10bxbNzCRJnD5Tk2rpCwayIx41hiTFzTKsXbOONS0h34fSHUu2pgdHPfT1mkbSLTB4 RL9TM6W+BZAgSYjXbO1Hnpvp3psmX3754z3zvuNY0zuVVKpvzrAofjGmWFBJeC4S0StlQ4 br/J3NkExr4+BIVG6dttAM7ypVXhkcjfpUyj7Ya2fhb9npvrrcVg34rDRnHNRsBKrsgALi 1qk5D+vGyKPXi0HjCkNCMYFuoQ29EnilZVk+kpKLs0LoPyFhTMdtluubsyisrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZtdLx5L92z76q; Thu, 08 May 2025 16:46:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 548GkXr8048957; Thu, 8 May 2025 16:46:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 548GkXeA048954; Thu, 8 May 2025 16:46:33 GMT (envelope-from git) Date: Thu, 8 May 2025 16:46:33 GMT Message-Id: <202505081646.548GkXeA048954@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: b064317fa8de - main - release/pkg-stage: Support non-release artifact builds List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b064317fa8deb46d5b63bb52375f349fc4d7d5f5 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=b064317fa8deb46d5b63bb52375f349fc4d7d5f5 commit b064317fa8deb46d5b63bb52375f349fc4d7d5f5 Author: Ed Maste AuthorDate: 2025-05-05 19:26:01 +0000 Commit: Ed Maste CommitDate: 2025-05-08 16:46:24 +0000 release/pkg-stage: Support non-release artifact builds Add -N flag to invoke pkg commands with INSTALL_AS_USER mode, and add package repo contents to METALOG. Reviewed by: bapt, brooks PR: 283387 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50173 --- release/scripts/pkg-stage.sh | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index fc74f8e6c0c6..ba6edf2eee07 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -4,12 +4,13 @@ set -e +unset NO_ROOT + export ASSUME_ALWAYS_YES="YES" export PKG_DBDIR="/tmp/pkg" export PERMISSIVE="YES" export REPO_AUTOUPDATE="NO" export ROOTDIR="$PWD/dvd" -export PKGCMD="/usr/sbin/pkg -d --rootdir ${ROOTDIR}" export PORTSDIR="${PORTSDIR:-/usr/ports}" _DVD_PACKAGES=" @@ -45,6 +46,25 @@ if [ ! -f ${PORTSDIR}/Makefile ]; then exit 0 fi +usage() +{ + echo "usage: $0 [-N]" + exit 0 +} + +while getopts N opt; do + case "$opt" in + N) NO_ROOT=1 ;; + *) usage ;; + esac +done + +PKG_ARGS="-d --rootdir ${ROOTDIR}" +if [ $NO_ROOT ]; then + PKG_ARGS="$PKG_ARGS -o INSTALL_AS_USER=1" +fi +PKGCMD="/usr/sbin/pkg ${PKG_ARGS}" + if [ ! -x /usr/local/sbin/pkg ]; then /etc/rc.d/ldconfig restart /usr/bin/make -C ${PORTSDIR}/ports-mgmt/pkg install clean @@ -91,5 +111,10 @@ ln -s ../All/$(${PKGCMD} rquery %n-%v pkg).pkg ${LATEST_DIR}/pkg.pkg ${PKGCMD} repo ${PKG_REPODIR} +if [ $NO_ROOT ]; then + mtree -c -p $ROOTDIR | mtree -C -k type,mode,link,size | \ + grep '^./packages/' >> $ROOTDIR/METALOG +fi + # Always exit '0', even if pkg(8) complains about conflicts. exit 0