From nobody Tue Apr 26 20:01:16 2022 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 3654F1AACBF4; Tue, 26 Apr 2022 20:01:17 +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 4Knt7114PBz4SXj; Tue, 26 Apr 2022 20:01:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651003277; 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=Wju7PrY8uXz4VYUL3NLFQUd5+Fs6s8JDdMH8UjJ10uo=; b=C34srNcUK4uLo0lCIVBJHmdV+Nq9cHAF/mEjF1Xivz3fgD4dV2TmLOELDzhOH0Y6crqiLc kvdFPuRNRYZcBxG014jme9VBGYyDmGhOm1Il4RSvNWdCioWiEJ0MS4NlfjABAcEHq+eoSh 2CRH/JhUeAjp8WmpDI7VVYKJSSe+QC1tFQPIYTNdFuNOHWr4zIXlTACf/5Mi9nlf4XFXx1 KZArKV5xuG6nprtWeJOMIsT7XORBuXoEe0+gmo58EcW1zFGTaqHa/zxkWgUmU+EmzH5GCf 23PaEfgaIiWxGVF+K1RM+NNW5fCgov4h6OILmu2R3LJtfdSXH60S2eq9IgJKsA== 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 0450915E70; Tue, 26 Apr 2022 20:01:17 +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 23QK1Gxd047911; Tue, 26 Apr 2022 20:01:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23QK1GYL047910; Tue, 26 Apr 2022 20:01:16 GMT (envelope-from git) Date: Tue, 26 Apr 2022 20:01:16 GMT Message-Id: <202204262001.23QK1GYL047910@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: 27c537bf05d2 - releng/13.1 - release: fix on-disc pkg binary symbolic links 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13.1 X-Git-Reftype: branch X-Git-Commit: 27c537bf05d242643df7483052eb737885aa4db2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651003277; 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=Wju7PrY8uXz4VYUL3NLFQUd5+Fs6s8JDdMH8UjJ10uo=; b=Mqez7UH5I+yV2YWtPO4KZWJooDFBPR/jXHHo0I1zNzlIbQUGUmKuAjVM68fPd7zo/vVZso JKsNeCU7ngqCEOf0ZaP1WqDcM/hSjNXhC/l3ygX0FjAyYTixqrZzkT5u6dpNJUJC4tgr26 jJDQgUTytzTkCEOnhcQotWxA5iVsTPa9hx2c/kN4E9MCL+kirBOHOFX/NAsI/mWn2gb4tk 7CSrnrjqdV6Vb7XpaNgdcrkeT9hN694N5kLAHk+w/yIfTuACVX4LVhBb9eyH/CKSLI8cZB 4UPdZDgHygwieIV5/TjSsfwN9w+B5eSKK2Lrekb0zjKDUyiGMKHXQ/512zyHBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651003277; a=rsa-sha256; cv=none; b=AGNgv62mtql9Q4Yxg+l5DxhNGEzxcL7o9fNxWy+KgLeTNUBlS2g5NnkVtvzWua9LpvJdzR Owdfs5ks1xefp+mpSsLCezJz5p/7JISWAm3To42nrhUfGTBhieyzcRxWwppGm6mtBAIysl +xleyF2v9+WR5YKiX2knjQq3gpgpW49p5ZPzOKi/QqQWSxy54L0s1KVTlcg0TUY6b1aUz4 6BY1EnLeIHxQ4IDY/O94Av9Uk5MjxlUtSGY5n9FLdPnZZ8OWCkfUXK61jvuyUua2iDuFhB GD93DZpi/dSGkEFYAeTx7ad6Bao6THzJzH9BzX1bwT69ahziPlyfiBruSYk1Ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=27c537bf05d242643df7483052eb737885aa4db2 commit 27c537bf05d242643df7483052eb737885aa4db2 Author: Glen Barber AuthorDate: 2022-04-26 19:52:40 +0000 Commit: Glen Barber CommitDate: 2022-04-26 20:01:01 +0000 release: fix on-disc pkg binary symbolic links Approved by: re (kib) PR: 263574 Reported by: loader Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 68b0a79b7c7ab75597e2511f880238fbf8cfad32) (cherry picked from commit fab1a7b9b6210257c5c048cdf754ca201fae7669) --- 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}