From nobody Wed Apr 24 05:06:20 2024 X-Original-To: dev-commits-src-branches@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 4VPRlx3S6hz5JnJb; Wed, 24 Apr 2024 05:06:21 +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 4VPRlw6bWyz4Swx; Wed, 24 Apr 2024 05:06:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713935180; 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=Ze7sps5BePPJi28EgjfNmKVIAMhKDRwKrEsauM4VF80=; b=s16bDNqoYXILC6yJ9SowF3N5/lHiZIoZ0Ui/YWXQnZJ56D9F1nyinDhvhfJXfFfyBFMtvh cKam22TV7eBy0afvqAXzhbUEYuXC7S69uBocsJS7DTc+ZsDBukviloKG0H0ZoKsCF0Rexu M77HkYSh5o53OgTX6seyc1IlV5UQoZTqaX4T7fIFWt9bOX8S0fnip6z/JJMQx6nqvucARa MZGyviMGi+pQUoKfVRRzYj2Gc1OoS2lynHXMRU0HRx3c147U0SAXU43QnRE/E8tZ9baunU Zqho1bubYks6XU1e/99eGOo4OnPLUMKkcWEGbhsNVcwv2aBZ6Ovkg5KmE6nG3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713935180; a=rsa-sha256; cv=none; b=cyLSubq8rURtyzKL6iqham0oOjBcOZ+bZCysVaktX4GgH+heNJtIedWKoplqMAhlM1EGcY fE/5B3q5gTC5nm1mwTtIbkrDm40QLG/5+VrpJo4ON7Hhfgf6Ion5YwZ3HVTnNc4XMHiQYU ora7ErV/Jy6ArAXI3HmqXYQsg8CVwCADXuISDdjzJ5o9rwtgAPdxtMqF3fPhy0uqfBPBJC f6iXG2iMiOwedY1hDU6h5Mru7K56hoiMmmuKaqPvJ78aCqgrgy8vhYK/yBHDs0VI+Ueq2l Kic6L/Toyy9VvQSuYiKnsI7gCnUu9pVaPc//HH7YIDNhnX3EHmU2/LMMhSEMFg== 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=1713935180; 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=Ze7sps5BePPJi28EgjfNmKVIAMhKDRwKrEsauM4VF80=; b=nKccSrgt88Zz3aImcHgk2mimFBM8WF5PCmfdulbDR14uzo+fA/i8oeqpXp6cXvX0+ys2gP 5dwW7/CON5rsDLYczB21Ab3CMlXHhXL0qCJlDv8UA1SXsNQlPQopDa/eujHAZM6a0l+MgG HhBTjX0aEDrj1qSNxGoks/n8sQjrGO/jLLNsFkZkiVhEyEpGWtl0cCyp/Eh2gNHcPvSmpu U1Clj0ZT7fqCr5yUVK7D00fRrG7UCeYlutqF4nCNiDwtvNHPhW9/Wdw/sFSTWpC1QUppqV DsVvifKMnP5W/F0OY5y5HGxA0RYph8BFV59hqi5DwqS7f57XP2W60uwz7NZFiA== 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 4VPRlw5hC3z11s0; Wed, 24 Apr 2024 05:06:20 +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 43O56K1t024073; Wed, 24 Apr 2024 05:06:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43O56K19024070; Wed, 24 Apr 2024 05:06:20 GMT (envelope-from git) Date: Wed, 24 Apr 2024 05:06:20 GMT Message-Id: <202404240506.43O56K19024070@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: 835b1bd4045a - stable/13 - release: Use the ABI of the target release to fetch packages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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: 835b1bd4045a7ef56f58868fc150d099b2ce135b Auto-Submitted: auto-generated The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=835b1bd4045a7ef56f58868fc150d099b2ce135b commit 835b1bd4045a7ef56f58868fc150d099b2ce135b Author: John Baldwin AuthorDate: 2024-04-13 21:16:01 +0000 Commit: Colin Percival CommitDate: 2024-04-24 05:04:44 +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 (cherry picked from commit ea2663040d524efd84b12edcbe83884437fdceea) --- 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 b96ce2947bb1..b51bdd4a2117 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 @@ -46,14 +47,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 @@ -82,11 +82,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}