From nobody Wed Jan 24 14:38:39 2024 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 4TKmmH6Hwsz58739; Wed, 24 Jan 2024 14:38:39 +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 4TKmmH5lpyz4hWT; Wed, 24 Jan 2024 14:38:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706107119; 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=WlluVM/yq3t32HMGK4a0PSUY9YFzYHFhfm84svSrR7g=; b=wC0XHV7K7GMkC1PTC/tQMm1dWKwTnA/vhsi5+HHyfFfHNgtpwqvaf9Uti10xHZ+ocYfcHf qnDsSOur+/L/4ktMl/eMxWdyO4gWhRW+4UoZfH9xQxmCKAgoU0EFnwo7SFElWxCrfhP7gp 0s2QvVM5oKVOqsbXJkPSfBaYmPhhKD4s3WahDKksvUqXElS3Hyp7mFN4OyRaHT7Pc3wLix HRZ/tQEawJR/9ou7kiCmqnID43YDE1+ZhY+6rsH7Jje0nKDe5E7QhpvKFAEglHuXInieYU 0u193qit3GbmNvctVK/hxPe4VjuwaU5vlbdpvS4VUypPHAnpuTATZ2NnVipqEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1706107119; 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=WlluVM/yq3t32HMGK4a0PSUY9YFzYHFhfm84svSrR7g=; b=yOF0pmdxxwqF8NkoLJ/0pXLZe0103zBlvXpF+Xl2nxUSTd2nOTAHhGkJdEAi22KX/MjepC n3cMTijfD01zoDa0psj0nASjxVqmjD3dWQZo9D7OQm0OoKDOLusBZIN01ux6fnLhbQue9/ YRTr8+4tYor4gZjh8ccprTNkbLJD+4eKuwxlDPzHBB2J9pKG1nxYcrHUfxIY1FYW5E1HoA zLRUu1O5yrQfAHKGTmV3e7Z3WkjZ+230I6O9lahObUWJaPRH6kajLR5rnezHf3NvkgYS7R IAfuilgLgfp70zDGp2OtnTZBnoCTmCHqP/wLIHMcjh4a5FGC1etXv5bmFsX/tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1706107119; a=rsa-sha256; cv=none; b=MV+3izrkUQVc96fP3IJPf+iFNI0aUnE+Xgl8Z4N7beegGCKrz1Y2JcRROnmRAsaP3Y8hbA imSKnyNg6FDg7uMMJI4hw+2qk8MQSVmvvT44P0Qqv6KpULPKajxDjXhawWWstx/ZGQDFnS vtoToNa613Apyt0Ul4kLIAADaxmTZsHh0MFOhgpFwIVLkrh2Q2QRERQG/ufXxzT0d0mtuH z8zOFIYx+Z+r/MerrQ+STVzrSSunTlHBN5+HgFPuofbDsh31MICMvlQRO0C3eOZdyMeE95 78JX7svIHtBsK+5CQbww8BFgsEacgXyedsPnyevu0vbKyUxo1C7znJxiVTFr8w== 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 4TKmmH4j34zJFk; Wed, 24 Jan 2024 14:38:39 +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 40OEcdMl083065; Wed, 24 Jan 2024 14:38:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40OEcdul083062; Wed, 24 Jan 2024 14:38:39 GMT (envelope-from git) Date: Wed, 24 Jan 2024 14:38:39 GMT Message-Id: <202401241438.40OEcdul083062@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: 2e9b8c8c1e39 - main - release: rework distributions list 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: 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: 2e9b8c8c1e3938335e17e63049887f8e8c6e11bc Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=2e9b8c8c1e3938335e17e63049887f8e8c6e11bc commit 2e9b8c8c1e3938335e17e63049887f8e8c6e11bc Author: Ed Maste AuthorDate: 2024-01-22 14:49:02 +0000 Commit: Ed Maste CommitDate: 2024-01-24 14:13:51 +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 --- release/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/release/Makefile b/release/Makefile index 3af7825c2684..3bfdde407cec 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 @@ -284,7 +284,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}