From f0bfc02cba55fe37f7f1c097e61179d9406c2a52 Mon Sep 17 00:00:00 2001 From: Colin Percival Date: Fri, 15 Nov 2024 13:38:06 -0800 Subject: [PATCH] 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 36c47e5ad45..3d96880d166 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