git: 60ec1704493a - stable/14 - release: Remove empty suffix from file names
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 21 Nov 2024 06:08:01 UTC
The branch stable/14 has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=60ec1704493ac92de9cb997c27d04ac199aa6ab0
commit 60ec1704493ac92de9cb997c27d04ac199aa6ab0
Author: Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2024-11-18 00:06:17 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2024-11-21 06:07:50 +0000
release: Remove empty suffix from file names
For "release" builds (as opposed to "snapshot" builds -- in this
context BETAs and RCs are "releases") ${SNAP_SUFFIX} is empty; but it
stuck into some ociimages filenames via a copy-and-paste error.
The final filenames on the download mirrors were not affected, so
this does not need to be merged to releng/14.2.
MFC after: 3 days
Sponsored by: Amazon
(cherry picked from commit d54fdd16636bbe6a38a5b0a636dd83cf64aa6e06)
---
release/Makefile.mirrors | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors
index 8af614d9a9bb..7e25d69588bd 100644
--- a/release/Makefile.mirrors
+++ b/release/Makefile.mirrors
@@ -380,8 +380,8 @@ oci-images-stage:
. endfor
. for CHECKSUM in ${CHECKSUM_FILES}
cd ${RELEASEDIR}/ociimages && \
- ${CHECKSUM:tl} ${OSRELEASE}* > CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX}
- cp -p ${RELEASEDIR}/ociimages/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} \
+ ${CHECKSUM:tl} ${OSRELEASE}* > CHECKSUM.${CHECKSUM}
+ cp -p ${RELEASEDIR}/ociimages/CHECKSUM.${CHECKSUM} \
${OCI_DIR}/Latest/CHECKSUM.${CHECKSUM}
. endfor
.endif