From nobody Tue Apr 26 20:00:35 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 26F1F1AACBA0; Tue, 26 Apr 2022 20:00:36 +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 4Knt6D0dZbz4S3x; Tue, 26 Apr 2022 20:00:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651003236; 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=HkEXPjMVKA3xFYgd4WvtC1M4+sYgdTaCff5kw5Sit2s=; b=xm2kBGqEoihLthzffQ3NM10ViiR+CrGRxH9DD7et69Ldogf32FOrc0gaGBhZk2pxwAaZs1 hBfp2jNpOiunSUMk6VVKQfpb+QyYr/TDxOZjEWijgPBrhYQp77kUwp1RhDvRB1IWgNcO7s cLnSqZUbxm2VhVHnrkINRJKjSozza3lZtIVE8zVhG6mY+ZiSGGDUhlRsWCh96xyLWyc34n tTuG9cZonP6MLNHs0xS5bN5je12A9sP3WRslLfmPjBbH89G50gbbBYBKyh70IHDE6a5JI5 cMwFWQmaCs5Bf5JhpCoK3CJqcb6XjQP8SDfovJAgLKKBss2gdQvvtJktadX5Ow== 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 EA3C4158DB; Tue, 26 Apr 2022 20:00:35 +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 23QK0ZBG047747; Tue, 26 Apr 2022 20:00:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23QK0ZMJ047746; Tue, 26 Apr 2022 20:00:35 GMT (envelope-from git) Date: Tue, 26 Apr 2022 20:00:35 GMT Message-Id: <202204262000.23QK0ZMJ047746@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: fab1a7b9b621 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: fab1a7b9b6210257c5c048cdf754ca201fae7669 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651003236; 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=HkEXPjMVKA3xFYgd4WvtC1M4+sYgdTaCff5kw5Sit2s=; b=CpeVz5fnhM6FGlGBVGnIOms205721bFiVjLSshbcKoCygv9y5qeT75+WoeI7zMWTAYK1qn NsiEznPko0p3Jqb4O+NeNIsLgKc7v6N5ZuY40iguXYPWFrq+uoUpMj7rOIaqWIpBDhyIKD T9LkUcVgOmIL0mFcnp7ISBmVprSZA4FDs1oVRJ9d7zy9uFNfKm+VGKDEWRwvSXIDwOTuKW xpcI3WEeMCSAFdLQlD2wWL4VEZnFgNyQQRD10pQ3z4VcJgdE3VmayvOgSYFBXGEyqocOX6 v/Syg4okRc2neFjGvzukEN91l9DzCxZBwmPuZOYmNa41qvcN9iFH2HQiISOjtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651003236; a=rsa-sha256; cv=none; b=Apw4o6kxW02wAOERkhaNRp3ZoI47mug5WlVz+TrH1zVXS4KhHT2ONxhcQc/bMLWwj57vxx hji7smUUicsFLN2sVtNN6yP6BWTzLmNbXOWnGfDQyHPwMc59KI3UJL1mSDzaJvUund3YDr gSQdGuJRuJunyPY6A/bfTvPyNdrLWrJxwFUu/JKAipOOz1Ouc1X7lQ9M8TNerw8ZGQQDRD L1aGJSGyBTl81CxZh4FzUEMmTbnOP41NHxuzyRBmUCUsrxSgpU7vYrSn2MT96tVvUS2PCs 4U+ltNJvNWFDN7ek9hcqKfaQDMQJDwlyiEgozCFIuaG6wcOGVZhT5UQgxnHxeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=fab1a7b9b6210257c5c048cdf754ca201fae7669 commit fab1a7b9b6210257c5c048cdf754ca201fae7669 Author: Glen Barber AuthorDate: 2022-04-26 19:52:40 +0000 Commit: Glen Barber CommitDate: 2022-04-26 20:00:25 +0000 release: fix on-disc pkg binary symbolic links Approved by: re (kib) PR: 263574 Reported by: loader MFC after: immediately Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 68b0a79b7c7ab75597e2511f880238fbf8cfad32) --- 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}