From nobody Fri Oct 10 04:46:55 2025 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 4cjZ341Njyz6BGWV; Fri, 10 Oct 2025 04:46:56 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cjZ336rh1z3D9H; Fri, 10 Oct 2025 04:46:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760071616; 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=iA2v4piF+Mgr4Bigno+ZelksqgcWdMRQkCdWKfW7BR8=; b=be51GNjiuRCZeFvXXTnYbkgVS294jHaiTObn5ZAwOQVcpc8CQ2H9j1w05742tyxoYTE5f4 v2egPuvp8hGqqcBAfEtxqxUibeqFh+PnXFeZBrJg6T4dKxjgqMnYMw3ExgO+WeekhvABQx oeJF81/8ZliKd4Bo9fOwQWlyTv3IJOC2cFZW6xV36Jf3+lGt3U84ha7oOWucJ6/B3LpPPJ jUNJSyT0cptuHJ3D25R1XCF8ERK30EpAOn4VR39/QfPSO8kE0hr4mFQzKA4uaPnhg0Bd8A DmoSL0Tx7feG5Um7xrcpjFjPV9G9DTMokpe6ZgGAPvuGWarlnHaOFa0BeFg1Zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760071616; 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=iA2v4piF+Mgr4Bigno+ZelksqgcWdMRQkCdWKfW7BR8=; b=pe7jd9LkhMQ4uXbt9dYNZZiCvdiWxr5HDYK3Flfrzbv5LykYaI4CjCTOeSA4Pj+APXlU2s 45CTnfuNfrG/iDKs/704iN4yFndHdgPsfL6t79DzrB0SWoftArhWjh37SP9jPSx3QJfB2J AFFLlKPvefo7ehxcraBsQjhxVrEK5r7JsP06FOHNyAVy95aLhwqO07tijLsGqY/FCnG+2m OuNSJeUuSinfre60fGl/qFX8iMOmDFfYSwz9ulxOvt75uodTcIXfgBhvJya03YAl9vLq8M Q2CIRppK9+4wY70egHeQhqwYJSrGAHIJ0Psa6pwkKb+bZ3MynkPl7sj2unEscA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760071616; a=rsa-sha256; cv=none; b=YadvGA+fx4w590UZcwo4al0d5fTN/gkQ+K0hi3J7greo3q77L5lLL2os+GQe6OoGlx2drb x7NrsvesVohVIqaK8o5mOcAOHdQfl2+02SB6J3G8jxw4N1w3zDxqxf3peo10mQJ1UGcvKv z3bbxIHgI7iIxQvw0WhxMhpqKieROrB1AKa7R/7g6A7nMgNW+GHsYIhBoA3XHidU32Fhk8 G08ofpxWvm2cvdT0rR9ih99Wmpo3St8JDifwS14SiOlLFkVc3CWUGFuE/nw47kLK1pLMGn ERUQqM+IvOXELwybGfirUdam/vlAcBmO/C+NCI6KpFoNfa7Ge8/VE7p+ZVeAHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cjZ336QNfzp8d; Fri, 10 Oct 2025 04:46:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 59A4ktP9098264; Fri, 10 Oct 2025 04:46:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59A4ktj1098261; Fri, 10 Oct 2025 04:46:55 GMT (envelope-from git) Date: Fri, 10 Oct 2025 04:46:55 GMT Message-Id: <202510100446.59A4ktj1098261@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: a1d3c0257a82 - stable/15 - release: Fix pkgbase tarball names on FTP site 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: a1d3c0257a82054bf2c29840c36b84943528458d Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a1d3c0257a82054bf2c29840c36b84943528458d commit a1d3c0257a82054bf2c29840c36b84943528458d Author: Colin Percival AuthorDate: 2025-10-06 21:33:06 +0000 Commit: Colin Percival CommitDate: 2025-10-10 04:46:43 +0000 release: Fix pkgbase tarball names on FTP site These need to have names like FreeBSD-15.0-ALPHA5-amd64-pkgbase-repo.tar not just "pkgbase-repo.tar". Fixes: d0ff67db2908 ("release: Publish pkgbase-repo.tar") MFC after: 3 days Sponsored by: https://www.patreon.com/cperciva (cherry picked from commit c943e6ff9ab0ce823e8ac51a6a17789a1945925f) --- release/Makefile.mirrors | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors index 6778b86873e6..ed9420e926ce 100644 --- a/release/Makefile.mirrors +++ b/release/Makefile.mirrors @@ -382,16 +382,16 @@ pkgbase-repo-stage: mkdir -p ${PKGBASE_DIR}/Latest mkdir -p ${PKGBASE_DIR}/${BUILDDATE} cd ${RELEASEDIR}/pkgbase && \ - mv pkgbase-repo.tar pkgbase-repo-${SNAP_SUFFIX}.tar - cp -p ${RELEASEDIR}/pkgbase/pkgbase-repo-${SNAP_SUFFIX}.tar \ - ${PKGBASE_DIR}/${BUILDDATE}/pkgbase-repo-${SNAP_SUFFIX}.tar + mv pkgbase-repo.tar ${OSRELEASE}-pkgbase-repo-${SNAP_SUFFIX}.tar + cp -p ${RELEASEDIR}/pkgbase/${OSRELEASE}-pkgbase-repo-${SNAP_SUFFIX}.tar \ + ${PKGBASE_DIR}/${BUILDDATE}/${OSRELEASE}-pkgbase-repo-${SNAP_SUFFIX}.tar cd ${PKGBASE_DIR}/Latest && \ - ln -s ../${BUILDDATE}/pkgbase-repo-${SNAP_SUFFIX}.tar \ - pkgbase-repo.tar + ln -s ../${BUILDDATE}/${OSRELEASE}-pkgbase-repo-${SNAP_SUFFIX}.tar \ + ${OSRELEASE}-pkgbase-repo.tar cd ${RELEASEDIR}/pkgbase && rm -f CHECKSUM.* . for CHECKSUM in ${CHECKSUM_FILES} cd ${RELEASEDIR}/pkgbase && \ - ${CHECKSUM:tl} pkgbase-repo-*.tar > CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} + ${CHECKSUM:tl} ${OSRELEASE}-pkgbase-repo-*.tar > CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} cp -p ${RELEASEDIR}/pkgbase/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} \ ${PKGBASE_DIR}/${BUILDDATE}/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} cd ${PKGBASE_DIR}/Latest && \ @@ -403,10 +403,14 @@ pkgbase-repo-stage: rm -rf ${PKGBASE_DIR}/Latest . endif mkdir -p ${PKGBASE_DIR}/Latest - cp -p ${RELEASEDIR}/pkgbase/pkgbase-repo.tar \ - ${PKGBASE_DIR}/Latest/pkgbase-repo.tar + cd ${RELEASEDIR}/pkgbase && \ + mv pkgbase-repo.tar ${OSRELEASE}-pkgbase-repo.tar + cp -p ${RELEASEDIR}/pkgbase/${OSRELEASE}-pkgbase-repo.tar \ + ${PKGBASE_DIR}/Latest/${OSRELEASE}-pkgbase-repo.tar . endfor . for CHECKSUM in ${CHECKSUM_FILES} + cd ${RELEASEDIR}/pkgbase && \ + ${CHECKSUM:tl} ${OSRELEASE}-pkgbase-repo.tar > CHECKSUM.${CHECKSUM} cp -p ${RELEASEDIR}/pkgbase/CHECKSUM.${CHECKSUM} \ ${PKGBASE_DIR}/Latest/CHECKSUM.${CHECKSUM} . endfor