From nobody Mon Jun 23 14:45:15 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 4bQrTl58Fxz60Q3B; Mon, 23 Jun 2025 14:45:15 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bQrTl1svJz3b4C; Mon, 23 Jun 2025 14:45:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750689915; 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=HFVGTPuF4jZk1HAGgctDjX9EbC5r+S9jtrXHHazAxP4=; b=DvaszQqTH0pktqo2OGBEvxnnFwVXjuZa2fFgCoXisHVFBKJKffcBcof+wb0rz41ObAdVOV Kbj+tqy0t4x7ba525n7kjtHhlaOiCUmbkwCHQYCeU07Zjr4/WxUCIcbSrXDEzAB/m7z35S ctvdZc3JdOUFqEJmyodrnUAC7HFp/YK/qiPrNBeAjjSbeOL1T13XxbumXHUYt6Yz2w2EgR YVoL6J3Kh+DuElDPADormijT0BmVyUAFm6FRSzTcA6hI5Uamr7kzWfQn5EC/4UU79CVQbU 52Ryi1yepXFxx29MyPQKWCd3xq1OSjIHAgVul6XI/X3803Z+aSGB6SbUraPfDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1750689915; 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=HFVGTPuF4jZk1HAGgctDjX9EbC5r+S9jtrXHHazAxP4=; b=DjLdf7iPZLGox7xhy0+CtpCuc5pp8SUEfc0LUWjcIXNudj8pEvydG84wC3f2k3moqrDh37 9coSepnEjYlERPX/BOaX5z4Mj6zcRDsM/jrvCtprU1s0sTU8FdUlMQ7h71v77kUB9Gcxs6 3s9yF1q7uvKca5oKwx4tMTR1jDOF/cj9KuWAl5lDV19093ALUZWOeUPnLc+Ax/uk7t2kWJ ZYfxIg8NEaeLc+G6wI0KRBrLukCIzKdidxb/wFhl7pTnlPKV/B5K3pNk/u3HnTwsCD8wbC 4wJaJGrr1UjGXtMuVPCNbYEW7T2HE376f0IRByFNDjWQrhrkQ1rqe1U2skAmvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1750689915; a=rsa-sha256; cv=none; b=iGkSBiakjb3w8bXlNESPhXzGxaP20g3beMF1ssE5/OkHWdbApYYJn1/hCPHF0LckJYTvW1 ai4fO5r3uie8ZHWOIzXyRtgvsVcZhGO8YH4lCLAUlSwgfmxGLkJ8bvrJ1OG/L8zQfieh9b pKLZGWdltwgTd2wB8GmbSQQT8fZB79549sYkvjGTew9fkLLTH/T2+NSG8Ms6kSYIMLm5RS I/lDITvMHCjU07MRMX5o3c24FJitcP/2QgCptXBaOq7htlwcJYUD+IHYnYYuu7tVgTgvTW JHQoCQ5nSEKbtTbxdhxzp5SsN5Qg6atmCW08ldJxFCImuLmRpL2Sy9s/SPKvyg== 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 4bQrTl1Mdqz16N7; Mon, 23 Jun 2025 14:45:15 +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 55NEjF8q058813; Mon, 23 Jun 2025 14:45:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55NEjFeA058810; Mon, 23 Jun 2025 14:45:15 GMT (envelope-from git) Date: Mon, 23 Jun 2025 14:45:15 GMT Message-Id: <202506231445.55NEjFeA058810@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 3f494a4e5ce0 - main - release: Add NODISTSETS to skip legacy dist sets 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f494a4e5ce005c04bd96ef75e52cca0fbaaa05f Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3f494a4e5ce005c04bd96ef75e52cca0fbaaa05f commit 3f494a4e5ce005c04bd96ef75e52cca0fbaaa05f Author: Ed Maste AuthorDate: 2025-06-18 18:46:10 +0000 Commit: Ed Maste CommitDate: 2025-06-23 14:44:14 +0000 release: Add NODISTSETS to skip legacy dist sets `make -DPKGBASE -DNODISTSETS` can now be used to build an installer without any support for dist sets. Reviewed by: Isaac Freund Event: Kitchener-Waterloo Hackathon 202506 Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50919 --- release/Makefile | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/release/Makefile b/release/Makefile index 4de2fe5264a6..5875a22a5bfd 100644 --- a/release/Makefile +++ b/release/Makefile @@ -21,6 +21,7 @@ # 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 # PKGBASE: if set, include pkgbase packages rather than dist tarballs in # disc1 and dvd1 installation media # PORTSDIR: location of ports tree to distribute (default: /usr/ports) @@ -179,6 +180,12 @@ packagesystem: ${DISTRIBUTIONS} sh ${.CURDIR}/scripts/make-manifest.sh $$(ls *.txz | grep -v container) > MANIFEST touch ${.TARGET} +.if !defined(NODISTSETS) +disc1: packagesystem +bootonly: packagesystem +dvd1: packagesystem +.endif + .if defined(PKGBASE) PKGBASE_REPO= pkgbase-repo PKG_ABI= $$(${PKG_CMD} -o ABI_FILE=${.TARGET}/usr/bin/uname config ABI) @@ -188,7 +195,7 @@ pkgbase-repo: mkdir -p pkgbase-repo ( ${IMAKE} -C ${WORLDDIR} packages REPODIR=${.OBJDIR}/pkgbase-repo ) -disc1: packagesystem ${PKGBASE_REPO} +disc1: ${PKGBASE_REPO} # Install system mkdir -p ${.TARGET} ( cd ${WORLDDIR} && ${IMAKE} installworld installkernel distribution \ @@ -211,6 +218,7 @@ disc1: packagesystem ${PKGBASE_REPO} mtree -C -k type,mode,link,size | \ sed 's|^\.|./usr/freebsd-packages|g' >> ${.TARGET}/METALOG .endif +.if !defined(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 @@ -223,6 +231,7 @@ disc1: packagesystem ${PKGBASE_REPO} echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \ done .endif +.endif .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) # Install packages onto release media. ${PKG_INSTALL} pkg || true @@ -245,7 +254,7 @@ disc1: packagesystem ${PKGBASE_REPO} echo "./etc/rc.local type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG touch ${.TARGET} -bootonly: packagesystem +bootonly: # Install system mkdir -p ${.TARGET} ( cd ${WORLDDIR} && ${IMAKE} installworld installkernel distribution \ @@ -256,11 +265,13 @@ bootonly: packagesystem MK_TOOLCHAIN=no \ MK_RESCUE=no MK_DICT=no \ MK_KERNEL_SYMBOLS=no MK_TESTS=no MK_DEBUG_FILES=no) +.if !defined(NODISTSETS) # Copy manifest only (no distfiles) to get checksums mkdir -p ${.TARGET}/usr/freebsd-dist cp MANIFEST ${.TARGET}/usr/freebsd-dist echo "./usr/freebsd-dist type=dir uname=root gname=wheel mode=0755" >> ${.TARGET}/METALOG echo "./usr/freebsd-dist/MANIFEST type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG +.endif .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) # Install packages onto release media. ${PKG_INSTALL} pkg || true @@ -281,7 +292,7 @@ bootonly: packagesystem echo "./boot/loader.conf type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG echo "./etc/rc.local type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG -dvd: packagesystem ${PKGBASE_REPO} +dvd: ${PKGBASE_REPO} # Install system mkdir -p ${.TARGET} ( cd ${WORLDDIR} && ${IMAKE} installworld installkernel distribution \ @@ -300,6 +311,7 @@ dvd: packagesystem ${PKGBASE_REPO} mtree -C -k type,mode,link,size | \ sed 's|^\.|./usr/freebsd-packages|g' >> ${.TARGET}/METALOG .endif +.if !defined(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 @@ -313,6 +325,7 @@ dvd: packagesystem ${PKGBASE_REPO} echo "./usr/freebsd-dist/$${dist} type=file uname=root gname=wheel mode=0644" >> ${.TARGET}/METALOG; \ done .endif +.endif .if ${.MAKE.OS} == "FreeBSD" && (!defined(NOPKG) || empty(NOPKG)) # Install packages onto release media. ${PKG_INSTALL} pkg || true