From nobody Tue Nov 15 19:30:47 2022 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 4NBbr746lFz4hYpm; Tue, 15 Nov 2022 19:30:47 +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 4NBbr73RBRz4KRL; Tue, 15 Nov 2022 19:30:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668540647; 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=z+x2fhb7yAzwBQJH9tSn9Zv5wbnY1/5m6icLL7EenGk=; b=jLApSx4bDHlDF91eeeIqjmyAfVuMU9DlFd3A3Fo2pjEWl7mjBdb4lrsenqBNTtJzFU9PwK KeQ16msaRmvD2/jbo1uQHrxDbumk2dvzzJs79B6URRuQJ0pZ9BDIh1UkT4rxUxGtHyJX/r fE6AeH86onO23VApUK55p8aCXyspJyQFboIBJdE10J6S/PrNPOSszxl5EP/lhHWSyaHdFz tcHytjVrgDF72rKXE9yG9k4T1IbiE4/E+ARJOO5hfQwcOlCq/EYCPefg107a5a0azLNy1P RRY3XK4qplCfQesL2JH1DnbHGR6Mb8Zc3qlhP7qzhvwQkepq9mfpB5GndORXzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668540647; 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=z+x2fhb7yAzwBQJH9tSn9Zv5wbnY1/5m6icLL7EenGk=; b=Ar87yJmZgAS48HzuKy2DiBrWx0JasQA8zjQ6SkcbBx3K5ojzatrxD7uDcBARsEPZONDzgM gsmd2FJowGa4mBdBLPLV5Dy6ZUCXHRdDUR4VAvAn8QXvJGuuS0S5CY3gkJei8DadoNWIZH 8hqRdrV+fTTYR4WG0oy/D1ewa0jAAUgGDvp5aQXe6syeSbX+WpET2CgpIzbpgz6ACpFBxG 5b0aooKs3LtHeyC6eRK6x0evZnX1hkrGSVSprDoHiMZdOvHQvTDo7X1uiUfOrzt8qUVJU9 0DjyLxynrMhH6j3Hg2W+a1CpSYhOX7tpiitaSdsNxBec6DZQXvI3sBTs76kpLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668540647; a=rsa-sha256; cv=none; b=fisFBcFFf+SpAen9hEFXw0CQ7aqyQhDw6MFsDvEJ3QQImb74l6jraH57MWldUFdxjJjlWR o/Q7B8PX8mfQwx8m0RgpDGNQ31//YXIUs9VG+PfyHCJZTGupwB0aVMHr6OUVvF+VysXi2n OFX1UXhdJHUpzapI+kwjWJBlUDDslM5CiQ21tF/6Lx+EHPubqr6Z6o4X9DaSiYZ93O7lOo zADMPr+OPfynv4NtenI4LPiK95HQYYjv75yLpCOh/AB5qc1pBZLS9itLWaoNcu/fsgEQkX IUp9ca33L+9t86UQqcNyclZvhzn7xw7E5d313tYrruTniv8BRDRMAZ4T8M9pcg== 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 4NBbr72TyBzYyD; Tue, 15 Nov 2022 19:30:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AFJUldx081410; Tue, 15 Nov 2022 19:30:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AFJUlZt081409; Tue, 15 Nov 2022 19:30:47 GMT (envelope-from git) Date: Tue, 15 Nov 2022 19:30:47 GMT Message-Id: <202211151930.2AFJUlZt081409@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Glen Barber Subject: git: 7b05f19e9708 - releng/12.4 - release: fix on-disc pkg binary symbolic links 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/releng/12.4 X-Git-Reftype: branch X-Git-Commit: 7b05f19e97087b2630e1142b13edef57f0540076 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/12.4 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=7b05f19e97087b2630e1142b13edef57f0540076 commit 7b05f19e97087b2630e1142b13edef57f0540076 Author: Glen Barber AuthorDate: 2022-04-26 19:52:40 +0000 Commit: Glen Barber CommitDate: 2022-11-15 19:21:49 +0000 release: fix on-disc pkg binary symbolic links Note: As this change was tested during the 13.1 cycle, but never merged back to stable/12, this change does not warrant an RC3. Approved by: re (cperciva) PR: 263574 Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 68b0a79b7c7ab75597e2511f880238fbf8cfad32) (cherry picked from commit f398c2d8323c8d8fde80fdb89c6c858b9996c22f) --- release/scripts/pkg-stage.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 6dd9f2b62f27..f1bb19636f75 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -86,7 +86,9 @@ ${PKGCMD} fetch -o ${PKG_REPODIR} -d ${DVD_PACKAGES} # using the on-disc packages. mkdir -p ${PKG_REPODIR}/Latest (cd ${PKG_REPODIR}/Latest && \ - ln -s ../All/$(${PKGCMD} rquery %n-%v pkg).txz pkg.txz) + 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) ${PKGCMD} repo ${PKG_REPODIR}