git: a1d3c0257a82 - stable/15 - release: Fix pkgbase tarball names on FTP site
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 10 Oct 2025 04:46:55 UTC
The branch stable/15 has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=a1d3c0257a82054bf2c29840c36b84943528458d
commit a1d3c0257a82054bf2c29840c36b84943528458d
Author: Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2025-10-06 21:33:06 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
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