From nobody Sat Oct 4 00:36:28 2025 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 4cdmmr3kgTz69ccv; Sat, 04 Oct 2025 00:36:28 +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 4cdmmr2WHGz3TWc; Sat, 04 Oct 2025 00:36:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759538188; 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=zqirfAnz4cnAuOY8I3zLCmnYZRVh5d+zWVSMSqtO5Ow=; b=tM/TA+wcMvyB1jMPxzA7lPjwuFgI7G/QEF88Sv9czgn9lggiSPLDFzUlN6mrKtXjLwA29D ePsD258PlyT/jc/nAGcmMg3EgYRvXDBX6XwstimSIKNSR5bL5qYt5Wl7XwRElhbJBoGY/F tvx9qRiofrVlhUWK6Fl3/4kFU075UBt6+YCDrW3x9eTM9XLqm62kGj1iN5eZx00/FmwouG ZpqD5oa8eQuhBD7stmwEsUNJw1uKH59vcQREH/5VAq8c65MnxfoQMQbBN+9NoZvhYbqgyi M2c1ae0iZ8DY26i6w28J5n1SrHSz2TwYN05W8AWtd5LaId3rTru+Qhzo2lZRzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759538188; 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=zqirfAnz4cnAuOY8I3zLCmnYZRVh5d+zWVSMSqtO5Ow=; b=Z4PIMRdL/SB/w6a7xDI+e9iSM5sDNiXHVSIojo5H5B3p4eBjduCE8YpUzwZvYBQxBNHX1E ncaYv+fCI6rGvdQR691ftqpDyGjs+1kDgoSoMrDrfHc543FiL21kfL79YFTrrQxNuOTAd8 vko94RjIs7M1mbBvi0P0T+z5TNBvtsohAw0UvSaoc/r2c8Fb/WIVFuM4SqTmBfkxqR4LNa rpPDa8LhQJyAi8RLUgv3QjF1zKPybcoYib3L7Ta8dGV0oRwCSGNE1Z+uoGRMwfoBKZfW+v FrfDb+RCFZEwmcAlO0FtP5zE9aXhQqWuPXT9oywlFvGsxuW7e1fZ7Mv3ESsrdg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759538188; a=rsa-sha256; cv=none; b=Z/OoTFtVKI0f2x7qJIURi6j+Rhm49zID8+If7k3ytphhWI83M4aJdb8AcXQ3w7loKu6Q6H z9HQmmpPwGCT33E+aaYzHE2ZGlTEPVS8Y3GNXt+X5lb0fK5T3ZIrjuBwbrX1YRFO/ODCh9 Knyfu1JD5VhAA9MoSZIBd6dmp6DJpuPfwxq5pl8DkmYdrf5T9OHO2opTQD+oGvUuNWQ5/+ Guwf3dOJwEfnmWnZ66iQ+kw3ekVHzla6v4gnO5M5rdEPJF3qQr2jjzlpfBp4xb7uIvWx2D PcdS1Wkwb1QaTMj3/cZUlQo4e5h89RXcwygOSJPvezbEB9CwMm0Q6N5VnX/1/Q== 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 4cdmmr261Jz2qJ; Sat, 04 Oct 2025 00:36:28 +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 5940aSLH030132; Sat, 4 Oct 2025 00:36:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5940aSYK030129; Sat, 4 Oct 2025 00:36:28 GMT (envelope-from git) Date: Sat, 4 Oct 2025 00:36:28 GMT Message-Id: <202510040036.5940aSYK030129@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: e64eb9ea0f4c - main - release: Respect NODISTSETS 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: e64eb9ea0f4c88a9fa32ae3ae517cbe15a193a08 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=e64eb9ea0f4c88a9fa32ae3ae517cbe15a193a08 commit e64eb9ea0f4c88a9fa32ae3ae517cbe15a193a08 Author: Colin Percival AuthorDate: 2025-10-03 23:56:53 +0000 Commit: Colin Percival CommitDate: 2025-10-03 23:56:53 +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 --- release/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/release/Makefile b/release/Makefile index 8616d3817dd9..dcff6855db50 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 @@ -449,7 +452,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}