From nobody Fri Nov 15 21:52:03 2024 X-Original-To: dev-commits-src-main@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 4XqrMl5qBHz5dcMk; Fri, 15 Nov 2024 21:52:03 +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 4XqrMl5F61z4mJG; Fri, 15 Nov 2024 21:52:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731707523; 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=6LnJaMvsmMrLbPFl/L0E3JXReeyLF+hHh2WT67YbNTU=; b=nMghjuSU5Bptj5sVOG2a1FuLAM/b4onOw9UeupTxDMBCSRjQtS0Dxy6hIk66na1IhXMnTl bqB5/Zx0s+Ine7h9cu17k8g5PRIWIuJU5imQUWPYRAcHrQs0PXps/weA4jsB0wCR3J2bsk 9y2E9vA/LXpGEWsz1LosmLPObB0Dv2zvZakldJ5wvX5QfWPcJll+Hq1cqDOHSG4ZqdzKRQ jlZv+ciRqkMGKjTF6RKPL3gtTFletzCQ9iJBpClmCPALvtcRz2JoMwaGTyPCaFh99S9/ew 90pWr2sT+KJyhAzymkfZ+bovKxML+q8xJudRW48R4nNuGvUfm4UT7y57qXzM3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731707523; 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=6LnJaMvsmMrLbPFl/L0E3JXReeyLF+hHh2WT67YbNTU=; b=viP6wPZDbuX74egPuWNYcOlWY9RYhY3dXY1sX10V5zirVvChsa7fqGq0QUhMJuslbXgqjT LPB7p1RdESX8ysKC0CpWtHPUlKvD2f1wjVcFOD1z0zAq4i45kpGJW+UjBwBVmeG/wG2lJt 1tDnPJTBxNKwf1eSp+aL9gLvto+u+xzIAcZtSJLC1SsRB/ssXKrVHzqwC0DTqbV0Yce0nW /9sDLj1h2KDfZl+Ri9l83atjBcozFRdq30LzFrn4LZOMGM2MIsew5zsQ6w8r3nvfzj8V4J ryhp2PqtB1F6ILaDys2XcnQYa9QyesJxQcLUavfVI3QoB5eKtqB3Kyn8HPB2zA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731707523; a=rsa-sha256; cv=none; b=Ij3mRnrXOW1dqKYyDBurx0vXc+P5KndaMyIuJRk4+Lt407eOTL9CmrLuYuU0TK/vvHNqu6 dsEIlCYsmHM5QV0afLi1IzaDHsC6R9HC+LU5Id/BXyRaeLAiHZ45AAw9V93ZS823zWyp1U SwqoMgYNoESTkituQqmJMXruJK42VMHdB/VviM1YtjwIMT6o4VOPe05wCH2Xlh0qDWqnYg OSavOysVoMd427mMa8vJ17MmWIVEkuvE2XGEDhNRgIvgohRFOhkLJRp3cl6ZA+Tr5fWtt+ QYxB0oMU/o6OB5HFq9XsnyDcPKjoWFbdjG3frYlf/bsioDKX0sAM4XCcj/5KBA== 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 4XqrMl4rSszgkR; Fri, 15 Nov 2024 21:52:03 +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 4AFLq3Sf059529; Fri, 15 Nov 2024 21:52:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AFLq3jB059526; Fri, 15 Nov 2024 21:52:03 GMT (envelope-from git) Date: Fri, 15 Nov 2024 21:52:03 GMT Message-Id: <202411152152.4AFLq3jB059526@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 976e1d36be68 - main - release: Don't copy container images into /ftp/ List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 976e1d36be688166e140cbaded01d433c61e6d47 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=976e1d36be688166e140cbaded01d433c61e6d47 commit 976e1d36be688166e140cbaded01d433c61e6d47 Author: Colin Percival AuthorDate: 2024-11-15 21:38:06 +0000 Commit: Colin Percival CommitDate: 2024-11-15 21:51:47 +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. Fixes: d03c82c28da8 ("release: add optional OCI images") MFC after: 1 minute Sponsored by: Amazon --- release/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/release/Makefile b/release/Makefile index e6b68a61ce2a..9617df7ffd48 100644 --- a/release/Makefile +++ b/release/Makefile @@ -317,6 +317,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