From nobody Mon Oct 06 21:35:11 2025 X-Original-To: dev-commits-src-main@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 4cgXcJ1MhCz6BbvP; Mon, 06 Oct 2025 21:35:12 +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 4cgXcJ0YqRz3SHV; Mon, 06 Oct 2025 21:35:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759786512; 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=lILK/HL2AszJILf2MGALv9vYJox2yE07Y/3vVegOxWw=; b=s2/YmjWzPhBdQb7B9jPae3udh5yHlAqOokJE3vuiExjlKgvIOMgPmPjCa37cIb5SQjBtSW oFyCaHQas9wgc/9zp9wpcEk+JjbPdlum/oxKFiEcWySr0XxJOitVNMOa4yVgmrNoZgAGpm ibnNkwIFtGdkQSfaUJHTbzYtIS1k9PJ5DR9Qbt1C5YjagLvZ/Ij/8asDHcFfNYcIHDpqQg Wj/vcm7OPI0SCIC/CJifOyzsEZ6VTx87fwkvuM8gOfMfy13ezn4Zdnn48Wga9p4jjMprPZ CuSSqakIXNc1FYgWLHEs6FT2k5/p0V7P1sOZ+1J+5VPsM4+q5ja2SFgUyoTTDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759786512; 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=lILK/HL2AszJILf2MGALv9vYJox2yE07Y/3vVegOxWw=; b=KjibZ249eikl2eVkA8wlGco8DPdk9KTOjId6mHWeKf2kVXo4HQtp/Fke/AbjwmJVemmlmL UPuhsCo9VYke6WxmrwFmH5AN1MfH/Ehxf6XiVC/O5w5mQCPQjhCbh1hfRSMbBa7LFqajtW K0dDNuSP090efRxwPT3j38adDxE+F7UThgMjBDozZSXLZFzCc6yMrwsV+WkFXD3pzm8y40 4emPyLxMfXotbfaPlVMpQSVeCNDbS5umM1J3cJW9Ng4uJsQFsMoEF898KQanlpPsm/Ks0J O8OPENtZ39kfB2QVOZZOZrGO7beVmE8K9wusCVM4yQIjuLQMoYNfvL3ogRs+Yg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759786512; a=rsa-sha256; cv=none; b=HXrdRB7dJ3zClS6cKccwFOeZJBYJAdwd7RgaBO0Xq1gw36kBjP83nqDPr924Q51IW+bY8q 9vMh2Ly7aB5oVoTc2dPtv0m9Qly3dY5bZxOWYplfwsS0u0qAIgFj+VjBkajXyhie1GLuma l9aLX8nD/j1waVqfoniTY2rCc2eSXMnxl3B14UsGqK2SuU/qpM5LRnABb03p0lDxfcdLk6 1HEPBFWvxFRdO3zAi0xO766uGcuLW7mjmnjmbYu0hoPOJmwpLb/jGzJLkd60xo/OMqJLEZ 9fTqqavUQrJVHX/JNuSdtF3/I5oIwUc3WI0X3sr7D8flLUeh41t7e96iE1bB7Q== 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 4cgXcJ03z8z1VT; Mon, 06 Oct 2025 21:35:12 +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 596LZBEc045042; Mon, 6 Oct 2025 21:35:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 596LZB0x045039; Mon, 6 Oct 2025 21:35:11 GMT (envelope-from git) Date: Mon, 6 Oct 2025 21:35:11 GMT Message-Id: <202510062135.596LZB0x045039@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: c943e6ff9ab0 - main - release: Fix pkgbase tarball names on FTP site List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: c943e6ff9ab0ce823e8ac51a6a17789a1945925f Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c943e6ff9ab0ce823e8ac51a6a17789a1945925f commit c943e6ff9ab0ce823e8ac51a6a17789a1945925f Author: Colin Percival AuthorDate: 2025-10-06 21:33:06 +0000 Commit: Colin Percival CommitDate: 2025-10-06 21:35:07 +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 --- 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