From nobody Tue Nov 15 19:06:16 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 4NBbHr4jTkz4hWHC; Tue, 15 Nov 2022 19:06:16 +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 4NBbHr4BScz4HCg; Tue, 15 Nov 2022 19:06:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668539176; 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=Sp5vfFQCIUo6IxySnIbIBwGXZLv+K08jtOsVEo5/x4Q=; b=n4Brc0pBEhZd4RajCFqaOqFXID0ZmRbUV/MjdZUu4h0Uqv7qDsTBws5WhfbwMsReBwmKO1 m9WHQ+bRi+90C3+dYAgj94z+ACduXQ3oivHEG07PnShZRfuNkcNqB4V3w1WreahJN7qzc/ aYxDrQ4XMbPVB9w+O0qmgazYNJmXmDHQuYQkUng45yyC/P+95+0LK/Gnl1BBOCZ+T7IJrx H3XputyU2NRE7ElOtfZ8u1iv8/UqfKfEWGgse0r++RbqAxwFukWKf0I5B4JIj7lgP41ssQ dmt/iN3CqqO+JK5Y0vXNoQ3Ot7zj5O3qjK4S+4qlg+OjMpaGTg6tXp3JvMaNzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668539176; 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=Sp5vfFQCIUo6IxySnIbIBwGXZLv+K08jtOsVEo5/x4Q=; b=B79Qxz27ruQ1m8qAEkoVE9Z8/qjaz25DKTceYDTMzuj1Ko9bmnT9kI93oiCLkb9zmh+OS/ 2F1mBrwWDrmPPpVlLcVGdtWU0hf2QVHtryPbG/9h2GAesHrmUHFJIXVi2XW2OA59zrmNwQ cbb/N0eS7T9gCloTOMJ9AfMF5/UVcbEPrITW0j+jFwuKeBVyxPLrRxRSsrc0O99Ee+2Oh5 AEp/6eShKB5YaEFSHifJyd452TK4kv1HghK6CPpJMeO2t/Adoyt9D5KnlJWJxXQoM0jwMv jLSWhozpfQOt0Tvh3YnRWCHGFyBWW3GXFFE7+Tquew+MT+vwuSvJyesuooM5aA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668539176; a=rsa-sha256; cv=none; b=MxdU0Ab9nePkGNpseBIRTbXEbDiEjDJX52hY45rJ52m26JQPILHvvDplfh9mKw+3mwOrO8 IVwyhfHnz6pbfAV51xXJqf/ZIpbugO4uyDeIEvgPgDqkVlzBF8UCinG49oBeFLOyDBfVeu 004rkRL95VmHZjx1yMKytmxx5fhq10ThFz2qF6BbqmbdSBuZXWAO/dpCWQ4zTnE48tJrih Lqn7zZu3eHYtmCYUB0vjA2ebPtacmcPWnP17RPzncW7upylS0qjGm0vVdNZ8jvMvmaGN9P CJn9n020smtPUBq491kAAKIEPmpXcqHeA8K/2x8BUkrfnDkAnmM7FfKHOrTIQg== 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 4NBbHr2zbTzYYS; Tue, 15 Nov 2022 19:06:16 +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 2AFJ6GkU043890; Tue, 15 Nov 2022 19:06:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AFJ6GD8043889; Tue, 15 Nov 2022 19:06:16 GMT (envelope-from git) Date: Tue, 15 Nov 2022 19:06:16 GMT Message-Id: <202211151906.2AFJ6GD8043889@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: f398c2d8323c - stable/12 - 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/12 X-Git-Reftype: branch X-Git-Commit: f398c2d8323c8d8fde80fdb89c6c858b9996c22f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=f398c2d8323c8d8fde80fdb89c6c858b9996c22f commit f398c2d8323c8d8fde80fdb89c6c858b9996c22f Author: Glen Barber AuthorDate: 2022-04-26 19:52:40 +0000 Commit: Glen Barber CommitDate: 2022-11-15 19:06:02 +0000 release: fix on-disc pkg binary symbolic links PR: 263574 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}