Skip to content

Commit c943e6f

Browse files
committed
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: d0ff67d ("release: Publish pkgbase-repo.tar") MFC after: 3 days Sponsored by: https://www.patreon.com/cperciva
1 parent dcb5ee4 commit c943e6f

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

release/Makefile.mirrors

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -382,16 +382,16 @@ pkgbase-repo-stage:
382382
mkdir -p ${PKGBASE_DIR}/Latest
383383
mkdir -p ${PKGBASE_DIR}/${BUILDDATE}
384384
cd ${RELEASEDIR}/pkgbase && \
385-
mv pkgbase-repo.tar pkgbase-repo-${SNAP_SUFFIX}.tar
386-
cp -p ${RELEASEDIR}/pkgbase/pkgbase-repo-${SNAP_SUFFIX}.tar \
387-
${PKGBASE_DIR}/${BUILDDATE}/pkgbase-repo-${SNAP_SUFFIX}.tar
385+
mv pkgbase-repo.tar ${OSRELEASE}-pkgbase-repo-${SNAP_SUFFIX}.tar
386+
cp -p ${RELEASEDIR}/pkgbase/${OSRELEASE}-pkgbase-repo-${SNAP_SUFFIX}.tar \
387+
${PKGBASE_DIR}/${BUILDDATE}/${OSRELEASE}-pkgbase-repo-${SNAP_SUFFIX}.tar
388388
cd ${PKGBASE_DIR}/Latest && \
389-
ln -s ../${BUILDDATE}/pkgbase-repo-${SNAP_SUFFIX}.tar \
390-
pkgbase-repo.tar
389+
ln -s ../${BUILDDATE}/${OSRELEASE}-pkgbase-repo-${SNAP_SUFFIX}.tar \
390+
${OSRELEASE}-pkgbase-repo.tar
391391
cd ${RELEASEDIR}/pkgbase && rm -f CHECKSUM.*
392392
. for CHECKSUM in ${CHECKSUM_FILES}
393393
cd ${RELEASEDIR}/pkgbase && \
394-
${CHECKSUM:tl} pkgbase-repo-*.tar > CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX}
394+
${CHECKSUM:tl} ${OSRELEASE}-pkgbase-repo-*.tar > CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX}
395395
cp -p ${RELEASEDIR}/pkgbase/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} \
396396
${PKGBASE_DIR}/${BUILDDATE}/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX}
397397
cd ${PKGBASE_DIR}/Latest && \
@@ -403,10 +403,14 @@ pkgbase-repo-stage:
403403
rm -rf ${PKGBASE_DIR}/Latest
404404
. endif
405405
mkdir -p ${PKGBASE_DIR}/Latest
406-
cp -p ${RELEASEDIR}/pkgbase/pkgbase-repo.tar \
407-
${PKGBASE_DIR}/Latest/pkgbase-repo.tar
406+
cd ${RELEASEDIR}/pkgbase && \
407+
mv pkgbase-repo.tar ${OSRELEASE}-pkgbase-repo.tar
408+
cp -p ${RELEASEDIR}/pkgbase/${OSRELEASE}-pkgbase-repo.tar \
409+
${PKGBASE_DIR}/Latest/${OSRELEASE}-pkgbase-repo.tar
408410
. endfor
409411
. for CHECKSUM in ${CHECKSUM_FILES}
412+
cd ${RELEASEDIR}/pkgbase && \
413+
${CHECKSUM:tl} ${OSRELEASE}-pkgbase-repo.tar > CHECKSUM.${CHECKSUM}
410414
cp -p ${RELEASEDIR}/pkgbase/CHECKSUM.${CHECKSUM} \
411415
${PKGBASE_DIR}/Latest/CHECKSUM.${CHECKSUM}
412416
. endfor

0 commit comments

Comments
 (0)