From nobody Sat Oct 04 00:36:27 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 4cdmmq2nqlz69cXf; Sat, 04 Oct 2025 00:36:27 +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 4cdmmq25Rhz3T6J; Sat, 04 Oct 2025 00:36:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759538187; 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=6p2peJCLBsz5h2vw8zgSfd7c1A/bch+OAwltaKdSU90=; b=Uq0t3RKKq5GiICHdRGft/9YFlgLxMFVjkofQX4RtNcXSYn6jPiGc7WeIcsgp+AmNpY9TK0 U1uUK0A94oE+sbep44YZpPG7ZQRmANcYwYCa6ko3WN1CFiZ8D8NqJFVO0P+pOiRJigQiGu aWAkn2cAC+USmYwe3mi7xoVpq3L9itM6tyACvHIGWw7GNE0jhkb0vzAvSZpxxEQ02k+M1j qWy8UDBbhZ+WHo6Sp92u2qPhjMwdG0Sch3fNOyeiVghlRGhmjc7wQRg7Cj6RecqVcc47vF aSpdEbMOHRt3w3KHd21TTcaF+mJrxcuOQR776gBS1Zt/idRPjXwkZkeM7tt7yQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759538187; 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=6p2peJCLBsz5h2vw8zgSfd7c1A/bch+OAwltaKdSU90=; b=KIisSt5jFoCCsBHey1S5WRV02nbtU0wY6tpULspJbvsuVz9K4yc6wR0pjpxIaOpGH2HrDF pcsFl6ND0opH2sfBosBQlTnVeWeVGnVCAdQn1lIkwXR0f1vePRrMCja9IOgd562xvqAsa5 3ZRqjQZJ12oV1Hxy4G+Lp7AZs66heq8Bo674oPwukIlIPiMDUuT5vtO2tsaPVd2v2rmmZi vqyGU7R4G+AvzGrKoPuPmT2+Q5g/RHdXnC2HCbAEnDnLdcHJT/dStkrhHKvQDqfinX6RKc yNDNNVytwdhZ57eyRlGssdR6gaRi/OUXg3AQ6HtmgwdIHKpKDvFEBs/HnvvSuw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759538187; a=rsa-sha256; cv=none; b=gbdzF5AM2RCO2K8gav7JGHfgPZHIFWQXieXdBPL+LWqYfqhb05IuiR5loBuflGI88TzXiP XGo93S7hNaDPA9vfywsVJygrjhFuKDMhT8pkCjbpEw7LhOHIFyLEiKIsV6HaBOLPT9TXIE wK3IGuvSyBRBNCz7E2OAXtUINSbFGFbeoL8jqXQ/5jg1jc8Q9m6nYANolFIFhNRRyz2lqB NvrzJTMkNtPIUFPnx4eiRdGIwt642EharIf9pzUjxhNKOzqKVYeC0FZ3oxgd/Os5fAJFKT Ewc9A9M1TCip9S+mFqq2Ws8FtYF0e5p1k33V+l7mD4mSXS1AltVS3J54Qw3OCQ== 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 4cdmmq1b4tz2s5; Sat, 04 Oct 2025 00:36:27 +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 5940aR0b030097; Sat, 4 Oct 2025 00:36:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5940aRqR030094; Sat, 4 Oct 2025 00:36:27 GMT (envelope-from git) Date: Sat, 4 Oct 2025 00:36:27 GMT Message-Id: <202510040036.5940aRqR030094@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: 4b8b4c7dbf0f - main - release: Check for empty 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: 4b8b4c7dbf0fd4f946195dd7e8e4ddf10505beea Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=4b8b4c7dbf0fd4f946195dd7e8e4ddf10505beea commit 4b8b4c7dbf0fd4f946195dd7e8e4ddf10505beea Author: Colin Percival AuthorDate: 2025-10-03 23:55:44 +0000 Commit: Colin Percival CommitDate: 2025-10-03 23:55:44 +0000 release: Check for empty NODISTSETS Treat an empty NODISTSETS the same as if it is not defined; this avoids problems if a script calls 'make release NODISTSETS=${NODISTSETS}'. MFC after: 3 days Sponsored by: https://www.patreon.com/cperciva --- release/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/release/Makefile b/release/Makefile index 76a99ffdf3f3..8616d3817dd9 100644 --- a/release/Makefile +++ b/release/Makefile @@ -196,7 +196,7 @@ packagesystem: ${DISTRIBUTIONS} sh ${.CURDIR}/scripts/make-manifest.sh $$(ls *.txz | grep -v container) > MANIFEST touch ${.TARGET} -.if !defined(NODISTSETS) +.if !defined(NODISTSETS) || empty(NODISTSETS) disc1: packagesystem bootonly: packagesystem dvd: packagesystem @@ -242,7 +242,7 @@ disc1: mtree -C -k type,mode,link,size | \ sed 's|^\.|./usr/freebsd-packages|g' >> ${.TARGET}/METALOG .endif -.if !defined(NODISTSETS) +.if !defined(NODISTSETS) || empty(NODISTSETS) # 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 @@ -295,7 +295,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) +.if !defined(NODISTSETS) || empty(NODISTSETS) # Copy manifest only (no distfiles) to get checksums mkdir -p ${.TARGET}/usr/freebsd-dist cp MANIFEST ${.TARGET}/usr/freebsd-dist @@ -347,7 +347,7 @@ dvd: mtree -C -k type,mode,link,size | \ sed 's|^\.|./usr/freebsd-packages|g' >> ${.TARGET}/METALOG .endif -.if !defined(NODISTSETS) +.if !defined(NODISTSETS) || empty(NODISTSETS) # 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