From nobody Tue Oct 7 03:16:22 2025 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 4cgh9y4S11z69D55; Tue, 07 Oct 2025 03:16:22 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cgh9y3TQbz3LKC; Tue, 07 Oct 2025 03:16:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759806982; 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=1SyuWDqeGIqnoVvMEGNtlS2Unhdori3lqp61B6Ujw/A=; b=nVq4OPuQeKtBYVeVlZ/N1JxxXf7qtareILSjZ4LD6XqsuKvQwZ7xNaU70a71vdJMnn9G9N O0HaDCYw46ll5NFrM+nbJoLCFmUumO7QEFDx9l5a+RExWWTG5rMiDWW0H71cYPWN7kmLpy MPm7CONwBCk+XlYOmxdQuvIaP5qbGWbJSKhxn/9Do2g8P4XW6qPN3XN6hbf1QRiA+pK008 rQfbwHJT3JzHwi+PJbFSaD5xDCcCUxI9e46vrn/9BVyS6fgpcwjDbHDaQgAd+Z2JT8eVWZ wKgLdigdCo593HZUfX+yvCu0crhz9K6AdiOTmmvsEjID9wgBT9Pb4pN5zgZ6hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759806982; 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=1SyuWDqeGIqnoVvMEGNtlS2Unhdori3lqp61B6Ujw/A=; b=w961z/4qz3a8jNxfUmdi/hsj6NaU8t9p+qQ9Doz9PIEey1TEKCE/XGuG0vuNgfeF/O4uoj cSipjmb2DDWaShYN+eRUR+P3nabAytWF0zIRALclGDBk/3aKfUfcla1Jzitj/mUuZcPuNv UQgD4c3n7mByPwvh8yS6YxizjMCMgtG40Ryxp8TkjtuqRfS1eIFqLM0j197Moh5cS9Xzyd g6j1pWvqpQjy5TI57WmdcFrWgdb5NoUfFkRK6E7ioY384ugjSBOHp/QJWdewOnFUfdisfa nNc/iIhqdGiBrITcih6nPiMsiIMXfPzQOi5+GBs4NTyWZ3RmIDZxdS6kz2Xlyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759806982; a=rsa-sha256; cv=none; b=do4DZmEgCsDgY5lrUFtl+dVNNyU4uv25n11V8859RNV3iWFZMT/vAEcKsAqKc8hr5o2uvd qyO74Nn5+RkT54w3yX7sdLPDzfun6BTslyPHxZBGzYNQGpKWXpIzDEfVN/0AcfoPbnuLdF mHYA5/8B97tnxxRe2wreqR/5yLfwj8o58VnbwesmDk1gPK4mn/21VguhGG0wp0Xoegj7ZR QvNw5Nv7+9X3X2BBmkNPF2A0MjAk5xvgI7rTGTvUna+MxGy92K2so8WllC0hZyODwXohFB 5pyo8fOd1ji/yVk8fKPx2R9Hh10TPmfqB+KbqcRpCB6U3qC8jkTk/MCG3SaV+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4cgh9y2zwTzBnY; Tue, 07 Oct 2025 03:16:22 +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 5973GMdJ089422; Tue, 7 Oct 2025 03:16:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5973GMsw089419; Tue, 7 Oct 2025 03:16:22 GMT (envelope-from git) Date: Tue, 7 Oct 2025 03:16:22 GMT Message-Id: <202510070316.5973GMsw089419@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: 4a62dbb24598 - stable/15 - release: Respect NODISTSETS 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/15 X-Git-Reftype: branch X-Git-Commit: 4a62dbb24598b5fbfd10575ec33233c24dca2705 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=4a62dbb24598b5fbfd10575ec33233c24dca2705 commit 4a62dbb24598b5fbfd10575ec33233c24dca2705 Author: Colin Percival AuthorDate: 2025-10-03 23:56:53 +0000 Commit: Colin Percival CommitDate: 2025-10-07 03:15:38 +0000 release: Respect NODISTSETS In addition to not putting distribution sets onto ISO images, if NODISTSETS is set then we should not build the distribution sets or put them onto the "FTP" site (aka download.freebsd.org). MFC after: 3 days Sponsored by: https://www.patreon.com/cperciva (cherry picked from commit e64eb9ea0f4c88a9fa32ae3ae517cbe15a193a08) --- release/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/release/Makefile b/release/Makefile index fb95deb76b68..73d92ad1eb52 100644 --- a/release/Makefile +++ b/release/Makefile @@ -116,7 +116,10 @@ DISTRIBUTIONS+= ports.txz DISTRIBUTIONS+= src.txz .endif -RELEASE_TARGETS= ftp +RELEASE_TARGETS= +.if !defined(NODISTSETS) || empty(NODISTSETS) +RELEASE_TARGETS+= ftp +.endif IMAGES= .if exists(${.CURDIR}/${TARGET}/mkisoimages.sh) RELEASE_TARGETS+= cdrom @@ -452,7 +455,9 @@ release-install: .if defined(DESTDIR) && !empty(DESTDIR) mkdir -p ${DESTDIR} .endif +.if !defined(NODISTSETS) || empty(NODISTSETS) cp -a ftp ${DESTDIR}/ +.endif .if !empty(IMAGES) .for I in ${IMAGES} cp -p ${I} ${DESTDIR}/${OSRELEASE}-${I}