git: f0bfc02cba55 - releng/14.2 - release: Don't copy container images into /ftp/
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Fri, 15 Nov 2024 23:30:51 UTC
The branch releng/14.2 has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=f0bfc02cba55fe37f7f1c097e61179d9406c2a52
commit f0bfc02cba55fe37f7f1c097e61179d9406c2a52
Author: Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2024-11-15 21:38:06 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2024-11-15 23:23:09 +0000
release: Don't copy container images into /ftp/
These are installed into /ociimages/ and stage onto the download site
at /OCI-IMAGES/; they don't belong in the same directory as the
"distribution" .txz files.
Approved by: re (cperciva)
Fixes: d03c82c28da8 ("release: add optional OCI images")
MFC after: 1 minute
Sponsored by: Amazon
(cherry picked from commit 976e1d36be688166e140cbaded01d433c61e6d47)
(cherry picked from commit a8bdbdbdba3e7c6e3a330026dcd82e922a4265c8)
---
release/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/release/Makefile b/release/Makefile
index 36c47e5ad454..3d96880d1661 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -320,6 +320,7 @@ ftp: packagesystem
rm -rf ftp
mkdir -p ftp
cp *.txz MANIFEST ftp
+ rm -f ftp/container-*.txz
release: real-release vm-release cloudware-release oci-release
${MAKE} -C ${.CURDIR} ${.MAKEFLAGS} release-done