From nobody Tue Oct 7 03:16:24 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 4cghB10Cqqz69D4y; Tue, 07 Oct 2025 03:16:25 +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 4cghB05HXmz3LPj; Tue, 07 Oct 2025 03:16:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759806984; 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=PnpY+EMwvVWfmY2G6L/fs9FwsyH59aHugq7aZ3W9zOQ=; b=oFWoCxDlqC7IXoN+SIVfXt2tCN5HtkYG0ou6c0UrcQ5DMVUhHuytn0hgXxIHxs7/ZKnvlv 52dL4Jx1mO9mGUnxLc2Qi1dPulJD18KbnzSvCfvOO3yEDcVGfTwAXBnj6NPb6AMevkSfFA FxzoAPTjCYihe+mq5XvmOAtNRGqV5R4gNzHbZs5Lj6UE55zC4T+vAGyE5wrelQ5NURckLk ahTh1eNaHoLJ12rDoBjkQu7sgdMzzGFWIOBPlv+ZVcb2VHNbIbN24XY1mw95re7XRZE67r O2khibALU3VUOMCtin7j6i8cexAKuO8Fv7dFxt2l0r+k8Nb0PKlCUydnEGF/2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1759806984; 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=PnpY+EMwvVWfmY2G6L/fs9FwsyH59aHugq7aZ3W9zOQ=; b=wTgi2aEVhgXv4/R3cigvLWXol99q7CdSbkib7C6z7t1a70cEHC0oCHkhoyQJTgbCelYh6y AaFa9APs+ewE34gk1nTE1MLhf8Hn37/W1prkjLkVfFjUMNXz2p+fQHQR3aFkPtKpRvKyk2 x1gbECsRM/cdq8MCq4fRN+2BFSKsHXSwsWhmV+Td5qtIbLpy3453kbe1H1oMcHpM7thYNP DrRhhBaAn3hicCPiRtMQHrmh58UTe7cU18fFdMRMJowd/5lnUQSsJS+z3i5Uj2RfIb0pSE D7+F3w7Rozes1ohxbm/L6LdVBWK3GQcy92Er+S55dG+gnw5j0hG8bxH2GK91oA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1759806984; a=rsa-sha256; cv=none; b=yQnAlE5/eDhssMcgfrJdL/c631e6GstKjOElxSDFT45BSZfgaghSkIdtcjieLtq0BbmFp0 SRVW/C6jjphjdfDvx/ChxMaGdRymO0hZWcdFYiL6y+EoeXQGnp2/A+ugGLb/ma7huySVfz Yppn4mCn2YLtyN5acnVrfVNlIJvnHTUjXvfucWnZK2ZSKvqME0zZjdpSYHDPl74KAJNITr 7hVxq81oXEBF8f/sTg5ZiJr5yAUghJdqtdJaR5acUBYFYHL+4jqeYTsKBw0zreURFVKk+S 1yStNRgEFy0J+AiiAIgux4hoCVBU2n59PF98YvD2PWTnRgKtlOHdi056alAJpQ== 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 4cghB04XPmzC5b; Tue, 07 Oct 2025 03:16:24 +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 5973GOIo089495; Tue, 7 Oct 2025 03:16:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5973GOQQ089492; Tue, 7 Oct 2025 03:16:24 GMT (envelope-from git) Date: Tue, 7 Oct 2025 03:16:24 GMT Message-Id: <202510070316.5973GOQQ089492@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: fc601f0ba805 - stable/15 - release: Check for empty 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: fc601f0ba8053896a4b67749d8e2a005d4c316b3 Auto-Submitted: auto-generated The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=fc601f0ba8053896a4b67749d8e2a005d4c316b3 commit fc601f0ba8053896a4b67749d8e2a005d4c316b3 Author: Colin Percival AuthorDate: 2025-10-03 23:55:44 +0000 Commit: Colin Percival CommitDate: 2025-10-07 03:15:58 +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 (cherry picked from commit 4b8b4c7dbf0fd4f946195dd7e8e4ddf10505beea) --- release/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/release/Makefile b/release/Makefile index 73d92ad1eb52..6bcb651d8dba 100644 --- a/release/Makefile +++ b/release/Makefile @@ -202,7 +202,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 @@ -251,7 +251,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 @@ -303,7 +303,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 @@ -354,7 +354,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