From nobody Sun Apr 14 23:45:59 2024 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 4VHn4S0qbNz5HJpw; Sun, 14 Apr 2024 23:46:00 +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 4VHn4R5xYTz42dN; Sun, 14 Apr 2024 23:45:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713138359; 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=YTjr2pE05A9CD+IsBG9Sfof7vdmEH2y6L5RE9eMjHyM=; b=MWRRLt7LJhcHxnlwdhyibTnyZ18bRLEF+OxzdtAxor6+XiKvnQetDgvDfs5meEf6++xZX6 oAwSmheE6/XmeusSsHYaopEtrGrTpuif9XgHRsCsJ/UhVhlWdFY7eQk0EaW18kGvgTjW3X ONfAlbGg/yfbXQz/OcbhVaJJznnTUWQY8hCJAiyK3TQGZ2zXfHqSExe8CLv3hOhcdi/I8L R54Gl9sPGa/r6tbKBZYE3AH/WVbYcSvJQxd3durD2tfsPXXbO0lAfaCclBMi2PHK3+Hovx /272hURcB/CSlwM6Fo2YBlbS41gvXlsNVD9YjphGtukuu0aWVI0RjfsJyg/lsA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713138359; a=rsa-sha256; cv=none; b=MXgynjrapQUJfvksda9coGYRQZGxivCgJcscHYw2+7MUS9F+PuSH713/DEjq/JMr4729T8 ippAHdd72knZj8JPJaV4tGJAvDh3Dw34y2wEJTmUCwHKKHJ4EBw0tmeLfE1j8+MObtuRNU mtHTYkJAwAZq+we9HcBbCyrr8/0HbTwhrzgD5RyRsItw1poJIEhf8wQAweqrRzjktb+dpJ VNjxSgKdKdqu3qXyAayK3JvF9gqpDY+JAVOfCxDeqDv+SVsD/bV/Orq23m6rv9vOZzQ4ih IgKb047kwpPh4DwjaP8Y1b1UZyUQ5dnfcJobZAAuQC0ScIoV2bKfY+4qRk24pA== 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=1713138359; 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=YTjr2pE05A9CD+IsBG9Sfof7vdmEH2y6L5RE9eMjHyM=; b=wLdKjVa9vCQ0y57nFCYM4ZV0CeaOqUmfhCcKKXbO00L/mzyREQ5H/YcO5srzBLPtGu+u1i gRJ5DJAy/TWa9Iz1PPJXLl7P22/CitTuxHErV+Rh/bfnI/zgL8M1tRCFR37P2FDTethfLy 1EhC5rO6mfyLZzEPf/inxhlOe9NiclTmeNMExia8u+yDVLSz5YkqIHSFSTzt50SAhW75Yh aefGAbe3cQtG5SlUFldig8jdz2Gwyy/EK+7g/t+EaGtKh1gEFqKZiq0gmHj4OB/DQiWD6z WnqvxJqU1xbk9Ais0BKgnhXB/eSfglUMSPa5j8rr6XHAcf4Qtp7F7y7s//eWog== 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 4VHn4R5XMMzcHN; Sun, 14 Apr 2024 23:45:59 +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 43ENjx4n012611; Sun, 14 Apr 2024 23:45:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43ENjxWj012608; Sun, 14 Apr 2024 23:45:59 GMT (envelope-from git) Date: Sun, 14 Apr 2024 23:45:59 GMT Message-Id: <202404142345.43ENjxWj012608@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: ea2663040d52 - main - release: Use the ABI of the target release to fetch packages 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 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/main X-Git-Reftype: branch X-Git-Commit: ea2663040d524efd84b12edcbe83884437fdceea Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=ea2663040d524efd84b12edcbe83884437fdceea commit ea2663040d524efd84b12edcbe83884437fdceea Author: John Baldwin AuthorDate: 2024-04-13 21:16:01 +0000 Commit: Colin Percival CommitDate: 2024-04-14 23:45:40 +0000 release: Use the ABI of the target release to fetch packages - Point --rootdir at the installed destdir in the dvd tree. This causes pkg to determine the ABI from the installed destdir instead of the host's binaries. Previously the result was that packages for the host's ABI were always downloaded breaking cross-releases (e.g. arm64 releases built on an amd64 host included amd64 packages on the DVD ISO image rather than arm64 packages). This also handles version mismatches, and I tested this by cross-building a 15.x arm64 release on a 14.x amd64 host. - As a result, pkg now does a chdir(3) to the rootdir before running, so the -o argument to fetch needs to be updated to be relative to rootdir instead of the CWD as make runs. - Add a new ROOTDIR variable to limit references to "dvd" to one place. Ideally ROOTDIR would be an argument to this script so that it didn't really know about the dvd layout at all. - While here, simplify creation of symlinks by just using a longer path to the link name instead of using 'cd' in the shell before invoking ln(1). Also use ln -sf to create the pkg.pkg symlink rather than rm + ln. PR: 278273 Reported by: gatekeeper Reviewed by: imp, delphij MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D44749 --- release/scripts/pkg-stage.sh | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 547ed15894d0..551876eca8c6 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -8,7 +8,8 @@ export ASSUME_ALWAYS_YES="YES" export PKG_DBDIR="/tmp/pkg" export PERMISSIVE="YES" export REPO_AUTOUPDATE="NO" -export PKGCMD="/usr/sbin/pkg -d" +export ROOTDIR="$PWD/dvd" +export PKGCMD="/usr/sbin/pkg -d --rootdir ${ROOTDIR}" export PORTSDIR="${PORTSDIR:-/usr/ports}" _DVD_PACKAGES="archivers/unzip @@ -48,14 +49,13 @@ if [ ! -x /usr/local/sbin/pkg ]; then /usr/bin/make -C ${PORTSDIR}/ports-mgmt/pkg install clean fi -export DVD_DIR="dvd/packages" -export PKG_ABI=$(pkg config ABI) -export PKG_ALTABI=$(pkg config ALTABI 2>/dev/null) -export PKG_REPODIR="${DVD_DIR}/${PKG_ABI}" +export PKG_ABI=$(pkg --rootdir ${ROOTDIR} config ABI) +export PKG_ALTABI=$(pkg --rootdir ${ROOTDIR} config ALTABI 2>/dev/null) +export PKG_REPODIR="packages/${PKG_ABI}" -/bin/mkdir -p ${PKG_REPODIR} +/bin/mkdir -p ${ROOTDIR}/${PKG_REPODIR} if [ ! -z "${PKG_ALTABI}" ]; then - (cd ${DVD_DIR} && ln -s ${PKG_ABI} ${PKG_ALTABI}) + ln -s ${PKG_ABI} ${ROOTDIR}/packages/${PKG_ALTABI} fi # Ensure the ports listed in _DVD_PACKAGES exist to sanitize the @@ -84,11 +84,10 @@ ${PKGCMD} fetch -o ${PKG_REPODIR} -d ${DVD_PACKAGES} # Create the 'Latest/pkg.txz' symlink so 'pkg bootstrap' works # using the on-disc packages. -mkdir -p ${PKG_REPODIR}/Latest -(cd ${PKG_REPODIR}/Latest && \ - ln -s ../All/$(${PKGCMD} rquery %n-%v pkg).pkg pkg.pkg) -(cd ${PKG_REPODIR}/Latest && \ - rm -f pkg.txz && ln -s pkg.pkg pkg.txz) +export LATEST_DIR="${ROOTDIR}/${PKG_REPODIR}/Latest" +mkdir -p ${LATEST_DIR} +ln -s ../All/$(${PKGCMD} rquery %n-%v pkg).pkg ${LATEST_DIR}/pkg.pkg +ln -sf pkg.pkg ${LATEST_DIR}/pkg.txz ${PKGCMD} repo ${PKG_REPODIR}