From nobody Sun Nov 23 06:14:31 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 4dDdvw3Cdlz6JL9f for ; Sun, 23 Nov 2025 06:14:36 +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 4dDdvw2kRwz3rtX for ; Sun, 23 Nov 2025 06:14:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763878476; 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=PU3XVioP7HzCYD9IgpibVuSXeBs6ajyXtw9KcEy08r0=; b=dl1TANc4vgQHwMcOkPaNEwjs6xxL9QAoRdCib2WlRbx1ctNMEXZBosBA7BD5E+U2TSgMYQ Z1FI9waAKyXFNZCQUCEjVW1Gfl7mggclws+ABh5qSzMDsX4yhVSse0Xqc5aXrGN5s2diRW VZYhhhCf+GIgSoFuWkvUSumludr058i3e4jFha0hPVRTxVJCaOZU4z65x5DedqdLpmSgMN Q8B0sfYXT0rmIMqEyc7Qs7QjW0gB/bY8BMxiisAUGm3rO/AlUiZb3XiuP/lba7+jiyIgEc LxWw6Atvil5skL4Z7oz9LQOx5j0ZYpTDi7cRx/OCHWsx4SQkweQDSDff7Zj6Ug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763878476; 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=PU3XVioP7HzCYD9IgpibVuSXeBs6ajyXtw9KcEy08r0=; b=RKlznNPosDUMDe/rWtvwtTZ6BDwdteNinCU1l0JrRMeGpi2DL5teREG7Vvm+HsQUFGWuQP owCxdP2PzJLtInGfRE29/YbANDQDMAf9Osd1clacDm07x4FOB4d42aD8rkC7n2JXXXtdxX moxZzA9PCbBJ+gJCY1aBxKFwK79/MKfanntsKjVp+qPEQJZqrTiXZMbXaFxysAlbuQGked 0TPzpHBEol3rzsyHUG2jH5Ur2jRnTsA2xzFbdON184po74t133Zzmx45mRr2IZKBfKv8Ui kdlv6enl4AhgS6EcLWfkbUEZPfTUPvF4zimxtVZ+FiiqtqbS3iLlmkYvihOviA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763878476; a=rsa-sha256; cv=none; b=spr+vvZl49wyJZo+KiTYMsaduwm8eRxZhJ5u5r5fnUp6PbUFV5DhJlfmzuyNvy1/TGLn+R pVENRkyI4IQ1uOzgMAV16ngWopnvfT9TwxjCZvnM6Dq1MbLYLHbPcxMB38bQv7Y6nqbjaG HyclaovaBgvShVZPv3MPOQ8A0TTGgrRw+KEQroUJpV5H9deZW3UGphZy5s92FYy7wvDa7m 0KAYAqFOT/8904IXbpGOP8qyJM52OEied/0jO0KcgBtxjLaDjQJUoKFNG38oQKsUKFbMaZ ef7a0Blx6jj6gQa0ERgqyHyluypUi3c5X5ll1g6ukWKAGok+V9DLy8uMGXX4zA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDdvw2Kbpz2Bv for ; Sun, 23 Nov 2025 06:14:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id ed69 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 23 Nov 2025 06:14:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: c8cf5a99f82b - main - release: Ship DVD with only emacs@nox flavour 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: c8cf5a99f82bc52849960e689442421ad5a6d412 Auto-Submitted: auto-generated Date: Sun, 23 Nov 2025 06:14:31 +0000 Message-Id: <6922a647.ed69.19d89240@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=c8cf5a99f82bc52849960e689442421ad5a6d412 commit c8cf5a99f82bc52849960e689442421ad5a6d412 Author: Colin Percival AuthorDate: 2025-11-23 06:03:03 +0000 Commit: Colin Percival CommitDate: 2025-11-23 06:09:10 +0000 release: Ship DVD with only emacs@nox flavour Contrary to the claim made in a previous commit, removing KDE and adding all of vim and emacs results in an image which does not fit into 4.7 GB; to be specific, it lands at 4.722 GB rather than the claimed 4.689 GB. (This descrepancy resulted from doing test DVD image builds using an out-of-date tree, and became visible when the 15.0-RC3 images were built.) Limit the emacs packages shipped on the DVD to the "nox" flavor; this brings the disk image down to 4.407 GB, aka under the 4.7 GB limit for standard DVDs. Fixes: 6cc6beb4c889 ("release: Remove KDE from dvd1.iso") MFC after: 1 day (for 15.0-RC4) --- release/scripts/pkg-stage.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 083b1baa3358..c575f2d32bae 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -15,7 +15,7 @@ export PORTSDIR="${PORTSDIR:-/usr/ports}" _DVD_PACKAGES=" devel/git@lite -editors/emacs +editors/emacs@nox editors/vim misc/freebsd-doc-all net/mpd5