From nobody Fri Nov 15 21:52:41 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 4XqrNT6vW3z5dcGv; Fri, 15 Nov 2024 21:52:41 +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 4XqrNT6Ctwz4msn; Fri, 15 Nov 2024 21:52:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731707561; 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=pk9cSYPdMt46e4iGULhwhzWeXF9jGk94WWigu9fbRgg=; b=oNbInp0KTkLVy3bq4zL3NXWFe0/LuHtfHvKlvrgANtOpkw6lU/lZfgmRhn1OkO2EMqeHA5 yUUVK4pTTiGBwfcedW2aehIyMB+lVoE3o1gC/NOvYVDB3I1J13OAd8Um4cThLxAWRdTjUW zcyTl95GzxrfB6BHSzo4+9apsW0Y/LgTsaOphfzWrjC69ofyjfP3GOMw3g6Vjec3qkxwzQ 6LSUYfT+pavcvSopZHB/3I7/8ya2pIqF2lzSf5oFebBETRRKWyptPSfrsSJGD+Cbjqfrat lz+8DUjjTNuAoTfOeFkjzBLBLkwE9+YULDmjqly9hyJFQHGAt/UNMpe/YvKIAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731707561; 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=pk9cSYPdMt46e4iGULhwhzWeXF9jGk94WWigu9fbRgg=; b=yTqG/8izFvzl8wlbDyo4gEsTE9EPxyarECooAG4rNC1nE4KBCjTTc2X+IKeB1GtGUw1/fL VjaYl9aQApZp8WsmsB31cNIee9Imsc4Nwsuf4GG1zhvHR7nb9ILC6Xk1AnhVHxAAaSpZvi +l2WWQUrO2FS3imS6+DR/W2pCbT1N9t+kkr+0gGfe3kgVo3MBuyKsZiAx8QQUiANAwgoht 9/Si8A0UA52q4ppcMI+in1NPioEYV5pasd8cr9LNhSWDgiCXuHrQOrB1K/qLtTx3E1N2n+ Dd7FtsJ7mYH+cyj+yzROPKBezY7MpD9wKP3VgHOdN3pqv6wUebO3Uxi0jZAbJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731707561; a=rsa-sha256; cv=none; b=fWZrsnNUxuqSIQCf94EdPnr7fjP7ZEO0PFqthZCjYea2rmeA1SCNw3jhUI/boBvCme8gqz SAbrsuqABUcz8CS+3bCfAyM2Y0SQralBFK5r3ciMet/6x2ARbyBMDMLgAgSjKt2dFWXDB+ nLLnAWuytx4RgfwpOuFSaljgeG0mgTIxmHutJXgmaZ7kdEEogDDElF9dNihpJOXS8YzY5R SNhnLcAaZSmWArU/4l3KVwXaq64Gl9Z9Ox+0A6GXZDJFBnxH+W6pixfLUDCFf3/Tzf5KlI HEsnUKS8OAOvNzLfH7FeJKebbN5HDMh/4MQkXbYqbMgaoQOBgY+AZzFPRHbjQw== 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 4XqrNT5pjSzgZj; Fri, 15 Nov 2024 21:52:41 +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 4AFLqfnb061108; Fri, 15 Nov 2024 21:52:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AFLqflp061105; Fri, 15 Nov 2024 21:52:41 GMT (envelope-from git) Date: Fri, 15 Nov 2024 21:52:41 GMT Message-Id: <202411152152.4AFLqflp061105@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: a8bdbdbdba3e - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: a8bdbdbdba3e7c6e3a330026dcd82e922a4265c8 Auto-Submitted: auto-generated The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a8bdbdbdba3e7c6e3a330026dcd82e922a4265c8 commit a8bdbdbdba3e7c6e3a330026dcd82e922a4265c8 Author: Colin Percival AuthorDate: 2024-11-15 21:38:06 +0000 Commit: Colin Percival CommitDate: 2024-11-15 21:52:15 +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 (cherry picked from commit 976e1d36be688166e140cbaded01d433c61e6d47) --- 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