From nobody Mon Apr 01 23:49:50 2024 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 4V7nmt3HJMz5FRHn; Mon, 1 Apr 2024 23:49:50 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V7nmt2kfnz4S51; Mon, 1 Apr 2024 23:49:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712015390; 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=C02FeL7WufYWy3SsH9TasBvK3/Zxsr6x1SVh19gZx8I=; b=rHxEA1Grffdy18yThNt0Nr+00FaAmeu6yqjqIlZ12rCT01XxM3O7+i6JHEX0vZWWHqzFtY bn4sti6cjgMxTxx4TZ5eMSPWVrWZR3ChRlBNMi/62SneuSkwyi7+n568VQqYMIvf+wQT0k XPuWN6dSPiGVFm/Ec1Arygo8xaU1t13/VrdUVu5Lq/+lPVmTdQbQjrvAxfD1phOOyXNIA+ OPS1dtSl2LdmfP4Mx8frCtbc5tMRokSk6B/dof+22XDiXgFjl1mij7BXNEfD31Qw68QoMz dNQg7g4z4fMRZFGKYiSFxz2BcQ/VuRGym3NY3z5Yk6nnNyB0oSSyPVxJlS5aAw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712015390; a=rsa-sha256; cv=none; b=C4dbKvg35fpMO2ZqVV1SXFQmEU2QtNSVVjKoEXzyjhOf4fmk2w8rQ47Spmm+QtlIeKTN0J Gg0Mwz2b+qKSrgeq/LQJ9T9xkyyCTti3QnmjDZSgUjZzWfnNXPGX2qHQUisxdY4Mc2cS6n M7PAWLnfZ5AYzYWkJEgD42wXDVA2e7gegaV/C216pBriUSZa2lbgr2+mdWfXHyePsjmtJM h0ehQas19sc7OnJI+hxM7lC/GeTIISemKtB1xzCNIdb5xV7ZHmBTOCMevnEuWWtcJPx6AG S4Md2aLToueKGHSx3mwU18D6+37REUojVktJZ0p99iFDrrPIeqb1OXkc72HinQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712015390; 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=C02FeL7WufYWy3SsH9TasBvK3/Zxsr6x1SVh19gZx8I=; b=ewOWsFXczcIwLz9Px9knxQncN9TV9anlkvdYwRkif3fybsnbcM9Hote51y5uf5FYQawBVt Zub4L2pAoUJLQZ7fzzXvKfxLDI70nBJj6w80vKSSr/9kt7KZ+kh2P6sz1wtfLXlyR58Hek cSZScoJ/EAiCkO/M+1dDHPBM2Z+kULPxIyDMrhX/4VE/5CYIiQ57nJ4UQgjI2x6b8KsYBT L/NB+AoxT2P0kDPgGczKJQiLlayEiJ/8F19wtJMWmXDCXnxNLKYyeGGFSA6hoNc+M/3ZfM UC1YaBrFNaYfXP2XhXFrSUQp+LM/RHZh8avSXg08pF5uNlfAzXza48iQL0ksXA== 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 4V7nmt2KRDzR1x; Mon, 1 Apr 2024 23:49:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 431NnoWw084674; Mon, 1 Apr 2024 23:49:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 431NnomJ084671; Mon, 1 Apr 2024 23:49:50 GMT (envelope-from git) Date: Mon, 1 Apr 2024 23:49:50 GMT Message-Id: <202404012349.431NnomJ084671@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 87c576a25a1f - stable/14 - release: rework distributions list 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 87c576a25a1f79730843b20a843b69e3f21f77f6 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=87c576a25a1f79730843b20a843b69e3f21f77f6 commit 87c576a25a1f79730843b20a843b69e3f21f77f6 Author: Ed Maste AuthorDate: 2024-01-22 14:49:02 +0000 Commit: Ed Maste CommitDate: 2024-04-01 23:49:25 +0000 release: rework distributions list Components like base.txz and ports.txz are called distributions in the installer, and with the introduction of pkgbase we will start dealing with normal pkg packages in the installer. Rename EXTRA_PACKAGES to DISTRIBUTIONS, and move base.txz and kernel.txz to that list. This introduces no functional change but is a small cleanup in advance of some pkgbase experimentation. Reviewed by: cperciva Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D43544 (cherry picked from commit 2e9b8c8c1e3938335e17e63049887f8e8c6e11bc) --- release/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/release/Makefile b/release/Makefile index 92d0106384a6..2cf6efe2e231 100644 --- a/release/Makefile +++ b/release/Makefile @@ -75,12 +75,12 @@ VOLUME_LABEL= FreeBSD_Install NOPORTS= true .endif -EXTRA_PACKAGES= +DISTRIBUTIONS= base.txz kernel.txz .if !defined(NOPORTS) -EXTRA_PACKAGES+= ports.txz +DISTRIBUTIONS+= ports.txz .endif .if !defined(NOSRC) -EXTRA_PACKAGES+= src.txz +DISTRIBUTIONS+= src.txz .endif RELEASE_TARGETS= ftp @@ -287,7 +287,7 @@ mini-memstick: mini-memstick.img mini-memstick.img: bootonly cd bootonly && sh ${.CURDIR}/${TARGET}/make-memstick.sh .${NO_ROOT:D/METALOG} ../${.TARGET} -packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES} +packagesystem: ${DISTRIBUTIONS} sh ${.CURDIR}/scripts/make-manifest.sh *.txz > MANIFEST touch ${.TARGET}