From nobody Tue Apr 26 19:52:54 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 A6BB71AAB2DC; Tue, 26 Apr 2022 19:52:54 +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 4KnsxL4H66z4Qtf; Tue, 26 Apr 2022 19:52:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651002774; 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=9Ph7oBAR96U6Tn/UxPOdT8MbQ6IrLONYMzHim+vmA40=; b=bwUaiHiXrraTv/l5HIKjnsu3wm1r8ZU6LbGF5oNrQZLHRlvK+fCckv0zMo5cHLbBQVeZS/ o6P861HPuiSzZ12lVEUUaVJM3LOlMB8NOiNpTF7UAm961L6joUAc6CBgFQVHazE7jx7/IH 1w1kmO8kO6a1nedtqdr9QQFgzBA6XP3o90Z7QDC2IKb3DeGzEM8R9QvH2PzKqHHLIwVIdo PSvpPl2m5XaQrcQh0ZO4G8PnSgNR3VgcUdH0qJBoL1acokU2qtNyG9yJGCgORoLIz009Mq ckYp+jqnd6JoX6THEJbFK4z9SiI4Y1pv0+khzHC6xjRpT+TSQqtgKIZhaPK0Ww== 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 7374715D97; Tue, 26 Apr 2022 19:52:54 +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 23QJqsuo037680; Tue, 26 Apr 2022 19:52:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23QJqsw2037679; Tue, 26 Apr 2022 19:52:54 GMT (envelope-from git) Date: Tue, 26 Apr 2022 19:52:54 GMT Message-Id: <202204261952.23QJqsw2037679@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Glen Barber Subject: git: 68b0a79b7c7a - main - 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/main X-Git-Reftype: branch X-Git-Commit: 68b0a79b7c7ab75597e2511f880238fbf8cfad32 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651002774; 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=9Ph7oBAR96U6Tn/UxPOdT8MbQ6IrLONYMzHim+vmA40=; b=R/kzajVED9GXTh6VAUWspp1S718GxqoEqbyWZRZzgYz9EWdBAAkjuFy+o9ILNzaxKYvSvy 5Br6pEv/wJNlxb1gv0rsr7HCPYo/5nVx7KCLXZ5ujm/SDc78UtaCPtgmnQPnPrj5m+HvRJ 40Z7VgLuh793HnzzWYDRqjmxinoRKll8DGOWrsPvJgJWdB/cJzWeSLAkm+TKl87UGOI74H +ck4pNnfqjSZg+rL6Rge26jMXlf+g+8OrmPlUo++yOstGa93TpSLe56C0VgCtmgCQW6FyK qIPKy9tvNL5bUN495XZPgO+WeVTnt8fnRWXV5cZ8xz2U6ZxQ88YzjzvcVPUe3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651002774; a=rsa-sha256; cv=none; b=hOSpSdNIPoPqlPMbabNx60l0Lf20hjjjxtWbWo5PBRji+RPotQybALGc7v2bZK1/vct27F 9KX2soXQ9dUXXN3pLQm9JqZncnMqpvLj9qS8PRDqbUg2EADH5UkH2ZF0r66wfePtHQzHZa fTOEi0oE7jm2arKyf41XlGmNhLBt9CSqzj8VBuWeJbkZzJFni5e7atdkRDzYz+5zbZruYw w9Tebd1XvzHFd+hCEuShi7AhCIGkfeMez+VeAaUePZI34WVeiOIpd/bDCcHHi6v5wTjOTa AtxWkukDjqFcry/XZh2CDpGH/jdcyfBtLHeVBlcF6wv9nxRhLvcn4blN7aD2tA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=68b0a79b7c7ab75597e2511f880238fbf8cfad32 commit 68b0a79b7c7ab75597e2511f880238fbf8cfad32 Author: Glen Barber AuthorDate: 2022-04-26 19:52:40 +0000 Commit: Glen Barber CommitDate: 2022-04-26 19:52:40 +0000 release: fix on-disc pkg binary symbolic links PR: 263574 Reported by: loader MFC after: immediately Sponsored by: Rubicon Communications, LLC ("Netgate") --- 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}