From nobody Mon Nov 02 02:16:45 2026 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 4jHwLk1wY8z6yR64 for ; Mon, 02 Nov 2026 02:16:46 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jHwLj6lrYz4LR8 for ; Mon, 02 Nov 2026 02:16:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793585805; 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=S0V2PpofsHCoBvLM1DQ/9Q0wOcUMHXk30b/goapgJrI=; b=Z81nHrXoLcMuHVl9nY1xuQn6zvSWF8pssxSNQXjWQKkWNAETn5xDke7J13aX6ZSojBAh3i NEWEVpnmvPfRPdLFM8eWGs3WTUW8dtkF1wzIejbMDre8OwSqGJ7UZ6SZV/mccihbODmLU8 xAvrLatCL0ibrHKt2n0SNpPrB1gfvZpRzg/8m8TyiFGjkT1SH16RPAvxAHddhzovdI+zye 3jNjBX+0vPPxPdoP7LR1WHZ5POrujCoUplLSBiv/icPW1W347CQAKr9sgdg+Ly5+Ixravd JDEIXH1UuCtsOYgcHzfM7TqoVWsJctfM0HhsYgg/AOq3WgQkkuS9e8k/lMsPTw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793585805; b=OjN8BWf6KERUVUpOxW9BXMZDA4Gv+owe+zT6xNT/p+O5kQbk1/KPAcxGeC4JQOOZvVhwkk qQf8LB3QfT1fHKjZljqBavoQvbdb3xZF8QQmkPLgrceMU42dLY+bCcZxdjF33rRyZK67td u+Cq7MNtdINHthlhVfDaSqg9RYLOLUnZI/OqdhmUfBsMamrNu3079ebomf9oGNSZXUtPr5 2ygiGWlpnZJtWwG+auBR5R+rbZhxsectrSkyhMMtlph8a9sQP4ZonixPY2mqsFAQ8EdBnI zglEj7IcnzqA9y1BvK2IG/1E6ZeFTi6BUjbWzm5kiX1C0CpxBj37tDVAr8D2cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793585805; 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=S0V2PpofsHCoBvLM1DQ/9Q0wOcUMHXk30b/goapgJrI=; b=yz33hUbofsV0eyXl5vzLLDzgiYBzJTGgLRfTB0UeY4VAUAtvtTKaAARKg6JXuaK0YJx97k Vly1KAeh++/LwhpKY3V34wdSUF38NCvmXvi/2WNMW0dH3oKXcxe1DcliIDRNPNV/E1FADa 4za1iDzDIShZe0wmNzlSf4mBPdstp8bdeN5qmTh59xBZLF0fEfFwbdJ13+bwT9H2rMraG0 niF0gii3dd45uRJAXROPdfxSCxEjzcTgY5mP2J7pIx1ORQd+w50SFEuPmnoMIIlm9X2Jp7 fbkuQZfjl9oRFwbFRgANNSDJwL+FD0XZ0cbDJsDcO06iGINe5eGY1Kq/zoFrJQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jHwLj57fXzPpJ for ; Mon, 02 Nov 2026 02:16:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 33d46 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Nov 2026 02:16:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 7b67aa67a71b - main - release: No distribution sets by default List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: Commit messages for the main branch of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 7b67aa67a71b02afe46d77199dac90d08ea5be41 Auto-Submitted: auto-generated Date: Mon, 02 Nov 2026 02:16:45 +0000 Message-Id: <6ae7f28d.33d46.47a1f42e@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=7b67aa67a71b02afe46d77199dac90d08ea5be41 commit 7b67aa67a71b02afe46d77199dac90d08ea5be41 Author: Colin Percival AuthorDate: 2026-10-18 17:46:40 +0000 Commit: Colin Percival CommitDate: 2026-11-02 02:16:23 +0000 release: No distribution sets by default Remove the "NODISTSETS" option and add a "DISTSETS" option. This option will remain, disabled by default, for the duration of the 16.x branch but will be removed in 17.0. With hat: re Relnotes: yes Differential Revision: https://reviews.freebsd.org/D60945 --- release/Makefile | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/release/Makefile b/release/Makefile index ed0496639e28..e2be82c961c0 100644 --- a/release/Makefile +++ b/release/Makefile @@ -21,10 +21,11 @@ # Variables affecting the build process: # WORLDDIR: location of src tree -- must have built world and default kernel # (by default, the directory above this one) -# NODISTSETS: if set, do not include dist sets or MANIFEST # NOPKGBASE: if set, include dist tarballs rather than pkgbase packages in # disc1 and dvd1 installation media and build VM/cloud images using # make installkernel installworld. +# DISTSETS: if set, include dist sets and MANIFEST. Enabled automatically if +# NOPKGBASE is set. # PORTSDIR: location of ports tree to distribute (default: /usr/ports) # XTRADIR: xtra-bits-dir argument for /mkisoimages.sh # NOPKG: if set, do not distribute third-party packages @@ -80,6 +81,8 @@ PKGBASE_REPO_DIR= pkgbase-repo-dir WSTAGEDIR!= ${IMAKE} -f Makefile.inc1 -C ${WORLDDIR} -V WSTAGEDIR PKG_ABI_FILE= ${WSTAGEDIR}/usr/bin/uname PKG_ABI= $$(${PKG_CMD} -o ABI_FILE=${PKG_ABI_FILE} config ABI) +.else +DISTSETS= YES .endif .if ${.MAKE.OS} == "FreeBSD" @@ -117,7 +120,7 @@ DISTRIBUTIONS+= src.txz .endif RELEASE_TARGETS= -.if !defined(NODISTSETS) || empty(NODISTSETS) +.if defined(DISTSETS) && !empty(DISTSETS) RELEASE_TARGETS+= ftp .endif IMAGES= @@ -202,7 +205,7 @@ packagesystem: ${DISTRIBUTIONS} sh ${.CURDIR}/scripts/make-manifest.sh $$(ls *.txz | grep -v container) > MANIFEST touch ${.TARGET} -.if !defined(NODISTSETS) || empty(NODISTSETS) +.if defined(DISTSETS) && !empty(DISTSETS) disc1: packagesystem bootonly: packagesystem dvd: packagesystem @@ -251,7 +254,7 @@ disc1: mtree -C -k type,mode,link,size | \ sed 's|^\.|./usr/freebsd-packages|g' >> ${.TARGET}/METALOG .endif -.if !defined(NODISTSETS) || empty(NODISTSETS) +.if defined(DISTSETS) && !empty(DISTSETS) # Copy MANIFEST to provide legacy dist checksums in both modes mkdir -p ${.TARGET}/usr/freebsd-dist echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG @@ -303,7 +306,7 @@ bootonly: MK_TOOLCHAIN=no \ MK_RESCUE=no MK_DICT=no \ MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no) -.if !defined(NODISTSETS) || empty(NODISTSETS) +.if defined(DISTSETS) && !empty(DISTSETS) # Copy manifest only (no distfiles) to get checksums mkdir -p ${.TARGET}/usr/freebsd-dist cp MANIFEST ${.TARGET}/usr/freebsd-dist @@ -354,7 +357,7 @@ dvd: mtree -C -k type,mode,link,size | \ sed 's|^\.|./usr/freebsd-packages|g' >> ${.TARGET}/METALOG .endif -.if !defined(NODISTSETS) || empty(NODISTSETS) +.if defined(DISTSETS) && !empty(DISTSETS) # Copy MANIFEST to provide legacy dist checksums in both modes mkdir -p ${.TARGET}/usr/freebsd-dist echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG @@ -455,7 +458,7 @@ release-install: .if defined(DESTDIR) && !empty(DESTDIR) mkdir -p ${DESTDIR} .endif -.if !defined(NODISTSETS) || empty(NODISTSETS) +.if defined(DISTSETS) && !empty(DISTSETS) cp -a ftp ${DESTDIR}/ .endif .if !empty(IMAGES)