From nobody Tue May 06 21:58:55 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 4ZsXNH5l9Hz5vVy3; Tue, 06 May 2025 21:58:55 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZsXNH46Rvz3LCT; Tue, 06 May 2025 21:58:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746568735; 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=ithVxtodOV/UAQG4Iak9qWgfvgQmqUwsq3V1mrgq3Qg=; b=GtzoldEISWeuhLMyuE2/wyrsTirp1fBFDMA8frSBV1Kp3LCLzpTcDmsqOKVyXKCIV1k6bI uuVOst72tEJuZN7qpPmH+q7YZX7LQfXpeAO1arPmJC8rB/fzTKj+rshLMSD5+lCyEOA6RY 9lm4ehEr5kL71XTULH3fTGGIMs41364dvFPU4Hkz8aDRUa87YEa7Ecdjnh8+3UGvzz3ymp dCuWRLGuiP1YhGNDwKYHM2zQRf7KDKlL4NgLidZY0YsK37m1foBn3Arewa/2r24evOSowz NPnyGQAMsuEJsJB34jhpUCBmqwo7r29+5m4CxMylOYU86gNYWSIWRk2QaeMowg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746568735; 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=ithVxtodOV/UAQG4Iak9qWgfvgQmqUwsq3V1mrgq3Qg=; b=nzwo2Ldkc02YoHi9hWRyTCGIYuQQVOQU3pWzCAs8rE/SfdztzVwssGQ4GirPrEwxRp5FSG acX77zj3NUxtwzjrMOZ+Pp/TKBl4eisL2vstLgQBSl/lZmxsU3L1bOGIUajow+DrADR36u KZfPw5P81MVBitzgFctfRfiIKUslf0DsUeoHwZw5VmDm/j5sV2Q0xrAjMczFbNGwX6X+G7 ULSbr8UnlDOMCWhfcsMa/Xg5Duj+/S4EDbTTSoV9ee1dqHXlRZ8Rxyb/If0fvdhtTe2X+E jThZT7sc+AHTCg75s6DTi32hPXD/gGB3oocjpnKAFUlR9aItkGSjVar4B5hIbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746568735; a=rsa-sha256; cv=none; b=mI8nrFFk9YKzuyLHuGcApApPvS71pmhZrMlfiI0Ur0491o1YALoS06qU0jdGREMaGu+tDD zyMsqduPijrqfIGHPczFo4C0BMsZZ7GJBHK1Cw0SkNTYId5wFxxrTWFx66qHGhBkD0vVQX 30AYsk9pxGtfpGr0KQ6PIkUznk4CGAMSbpCXmzJMy7wjKZ73yG9BHAWO6mV77ibeF+UroZ bu1qdRhIQCgy1Q2xH6ED1bVX2WEtgagE0NFGbmleP0aRq20XUzd3Xtn7uAl4ZUL6bXEDRQ Egpy5AwACfapqU3y8ibQOl7roFM0SkgmKFaMgNBC9ABIiGS6A1taRjWH6l1V9A== 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 4ZsXNH3YBlz1GWY; Tue, 06 May 2025 21:58:55 +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 546LwtHa024717; Tue, 6 May 2025 21:58:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 546LwtwP024714; Tue, 6 May 2025 21:58:55 GMT (envelope-from git) Date: Tue, 6 May 2025 21:58:55 GMT Message-Id: <202505062158.546LwtwP024714@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: 16d0fe1f721f - main - release/pkg-stage: Put each package on a separate line 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: 16d0fe1f721f63d15c741ff4c0072390aaa27e73 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=16d0fe1f721f63d15c741ff4c0072390aaa27e73 commit 16d0fe1f721f63d15c741ff4c0072390aaa27e73 Author: Ed Maste AuthorDate: 2025-05-06 19:37:55 +0000 Commit: Ed Maste CommitDate: 2025-05-06 21:51:50 +0000 release/pkg-stage: Put each package on a separate line The list of packages included in dvd1.iso is maintained in pkg-stage.sh itself, and sees regular additions and deletions. Rearrange the beginning and end of the variable so that each package is alone on a line, to make it easier to track changes. Reviewed by: cperciva Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50221 --- release/scripts/pkg-stage.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 821f15e01bd8..fc74f8e6c0c6 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -12,7 +12,8 @@ export ROOTDIR="$PWD/dvd" export PKGCMD="/usr/sbin/pkg -d --rootdir ${ROOTDIR}" export PORTSDIR="${PORTSDIR:-/usr/ports}" -_DVD_PACKAGES="devel/git@lite +_DVD_PACKAGES=" +devel/git@lite graphics/drm-kmod graphics/drm-510-kmod graphics/drm-515-kmod @@ -33,7 +34,8 @@ x11/gnome x11/kde x11/sddm x11/xorg -x11-wm/sway" +x11-wm/sway +" # If NOPORTS is set for the release, do not attempt to build pkg(8). if [ ! -f ${PORTSDIR}/Makefile ]; then