From nobody Fri Nov 15 23:30:51 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XqtYl3wWnz5dj1V; Fri, 15 Nov 2024 23:30:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XqtYl20V5z3xn3; Fri, 15 Nov 2024 23:30:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731713451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IT5habeBZzf4vIz+EI5DUMIAW8EtK3gPWvPh9PbflSk=; b=eFXlbbB9Tvl6HT46CL007rON/wguqdGRR1ZRwHcRK7eejTXg3+bn7Qu/mZqnmWSTdL9j6V /kUJ0jcrYsezfFsQJq8rJyPsTsirlepH67zsWYmBzEO2FcGd+r1xDas55e+4m/rFeWBx1P 9J5MaShERZ6YLV9EcullMnpa6eonhqxwkqM6h10OK2skTcltFgv2y/BwLdiPZImwVUC6Hc 4WeX0b/3gIy4LBi4lENd2+t4IOATDAWw4kTGKZ0d9BEkqPVtnfyJxysuLQRroKvvY7xFFE 0abc0UpwA7qOY4XrmXRL4+opvAe4ls5pZNTl+XBOIiGYmxbT0wfFvMt1X2DRnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731713451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IT5habeBZzf4vIz+EI5DUMIAW8EtK3gPWvPh9PbflSk=; b=A55dl1kEp7W1ksGr5fvzB9kP7ndTEM2SYxwE6mT44dvQbuRSkyxWi676D7+dYgYNkW8DqX mu+jc+wOisxul6weBCbEzsgwNVUkR7stgmTw0pH2Mfbc+t9K4SJn6CgZXQW9qwhghNwwFM JQXYjeG4KAJqe2wT8dnfiMkWMt+NaaCfGJBDTfh4n7EKLP4Ch5v4dHG/qd+GuuI4Wo+rFe U3y9jxq71rFV1+N/buptQfP2ZQXc6XjcnyZrFiuipuVdxLu7djF04sglCWCFTnFrEkR2AP TeWvEL+9J/zKuE+3Nznd6G6p6UFMztryEPEgeuk/PA57GYlA6uooeUpK7Veraw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731713451; a=rsa-sha256; cv=none; b=bXB+uPvqvMAr39xWCT1tWU+kVl/XuRtr1sIIXCwACCNI7ppXgwGCYhEVtBS/+vo2f/jrUj 3ZuYWvnFuAWRWY6VYErsk7z6P21szMER94KlPHRp/9S9mA28OEx7z78mwBLTFIp11ycFOj WzpqsDPOWMz4K4LN++ZpacLdAPCgieqHlSOu4G8qDK4lxu1MU5sx+4q2iXnK5JlxvhZsHf EDxKGeuUnyth7saosu4x9oLoHE+4C6dMc1YyA5jzIj2Ol8khyWk8V5y9/XgnwKFcc8kg78 tfRMyfv1gvUgUX3hLRK3W4LdIYCp9+pW8EOLl9NY3PUIsXa8DEivTYToGiwVXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XqtYl1PqHzjf1; Fri, 15 Nov 2024 23:30:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AFNUpfg042093; Fri, 15 Nov 2024 23:30:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AFNUpIi042090; Fri, 15 Nov 2024 23:30:51 GMT (envelope-from git) Date: Fri, 15 Nov 2024 23:30:51 GMT Message-Id: <202411152330.4AFNUpIi042090@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: f0bfc02cba55 - releng/14.2 - release: Don't copy container images into /ftp/ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.2 X-Git-Reftype: branch X-Git-Commit: f0bfc02cba55fe37f7f1c097e61179d9406c2a52 Auto-Submitted: auto-generated The branch releng/14.2 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=f0bfc02cba55fe37f7f1c097e61179d9406c2a52 commit f0bfc02cba55fe37f7f1c097e61179d9406c2a52 Author: Colin Percival AuthorDate: 2024-11-15 21:38:06 +0000 Commit: Colin Percival 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