From nobody Thu Aug 22 22:00:19 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 4WqcZW4jd7z5TjwP; Thu, 22 Aug 2024 22:00:19 +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 4WqcZW274mz4g7p; Thu, 22 Aug 2024 22:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724364019; 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=VZPPQUbKtlyvHaM41AcNelGZH6MrCxp7KfAucBUNCUI=; b=UyQwB6Z9JPbdgcOhxQmVqgzrIBb1kuRXGU9lhu/h8cv+h3ErmhR8tYoEPB8xBxzQeucgea GyrSmCjOLZTj5meGuDYkHiFNoDUAok2WMQjryTTOUYZD5LGtyvtfbuMl1l7lUBQi3DoodF 8Ohl3FHkEt3eMAtQWskRERiXB3Boq2/PAdjSs5/n9rJXj/r3vIbtctuZAtFjbFqz+2An4S VkKUCJbfCkSjbf9Eh9J1ZyLk+gPDYX3ipqyJYc+UPsxXICly5KnJjKkpTdDW61o80SxpAb Xd3Y+qHIj6H5lvGd3p3FSuOosUNm4loEwSby0/ETYI9jzaS/s0kBtfydwNK6vg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724364019; a=rsa-sha256; cv=none; b=IbsRE6aFtx6nGD+KV8C839WgpCiWvbiR24Y1FZmIIsSiImhLbcFA1uoI6xyL2B7wye7Rrk HqdYsHPvyVZF41iE1H+GkIvuffB7YBQYELdOsYyhWBDPvdUtxubc7keGp5lJ6CB2FmYYtd fXHWl5rc6CSOwr2yb3qQ+B/1XCUVSC/MdklFK1H1JBpMfWDeLwASOqitWS1CqZ/m6p4rSz z7ogl6CnnpJavz4zoxEdBtoV+PcYQR4UQg5OeNl9XvVdRl5XIUnfTuxVInqO4ZUhbdLBWJ O+mWZ4t0KWhh460GZujpX7KkVFlRZrMoKerLu8GvkiFPECWfNtci1/DzfyePXQ== 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=1724364019; 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=VZPPQUbKtlyvHaM41AcNelGZH6MrCxp7KfAucBUNCUI=; b=c0kYjCtRSPQK0N9Ti7f/9lFWTHdzift3pyzHXWsM8WDy83mNfqMQ+smyZZj5sX1avCh+px m/qscCNKiX8MgP43Wopfny5ek/DBXse28LGbL+JBN62WbE5T0NX/AlNLjKE3y7UcAcBljw Oe9jm9WvMXHBuOJuM1mjr9SQGcNpWpuZaruRqdM9oOYnrpzq5NftzGot+jicLagU6fLMD/ CcRUDV4VNoN/FChjkMLRBx33g1skfXNH7K0te/LNqkr4Bo2lu11wjYWIbFg4MUm8hHLkZB w9yN5WJCJI5E6QAoUov1A63w3v2Tx20o78h4g2NCXzNQJ4eB4DOuxE4kB9wr1A== 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 4WqcZW1lJlzlVY; Thu, 22 Aug 2024 22:00:19 +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 47MM0JAT081367; Thu, 22 Aug 2024 22:00:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47MM0JBd081364; Thu, 22 Aug 2024 22:00:19 GMT (envelope-from git) Date: Thu, 22 Aug 2024 22:00:19 GMT Message-Id: <202408222200.47MM0JBd081364@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: a926bf9254b2 - stable/13 - Modernize DVD package set in preparation for 14.1 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: a926bf9254b2a5a9c3b60cf1760fe7746584308b Auto-Submitted: auto-generated The branch stable/13 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=a926bf9254b2a5a9c3b60cf1760fe7746584308b commit a926bf9254b2a5a9c3b60cf1760fe7746584308b Author: Colin Percival AuthorDate: 2024-05-20 17:42:49 +0000 Commit: Colin Percival CommitDate: 2024-08-22 21:59:53 +0000 Modernize DVD package set in preparation for 14.1 [MFC note: We're making the same changes for 13.4.] Remove archivers/unzip (now in base) and emulators/linux_base-c7 (old and unlikely to be useful without other linux packages being installed), ports-mgmt/portmaster (now largely obsolete and discouraged in favour of using pkg and binary packages) and x11-drivers/xf86-video-vmware (questionably useful). Replace devel/git with devel/git@lite (sufficient for most purposes), and adjust the "ensure the ports exist to sanitize the list" code to ignore the @lite part when checking that /usr/ports/devel/git exists. Add sysutils/seatd and x11-wm/sway for wayland support. MFC after: 1 minute Differential Revision: https://reviews.freebsd.org/D45278 --- release/scripts/pkg-stage.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index e9974deaae29..b7305337c012 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -12,28 +12,26 @@ export ROOTDIR="$PWD/dvd" export PKGCMD="/usr/sbin/pkg -d --rootdir ${ROOTDIR}" export PORTSDIR="${PORTSDIR:-/usr/ports}" -_DVD_PACKAGES="archivers/unzip -devel/git -emulators/linux_base-c7 +_DVD_PACKAGES="devel/git@lite graphics/drm-kmod graphics/drm-510-kmod misc/freebsd-doc-all net/mpd5 net/rsync ports-mgmt/pkg -ports-mgmt/portmaster shells/bash shells/zsh security/sudo sysutils/screen +sysutils/seatd sysutils/tmux www/firefox www/links -x11-drivers/xf86-video-vmware x11/gnome x11/kde5 x11/sddm -x11/xorg" +x11/xorg +x11-wm/sway" # If NOPORTS is set for the release, do not attempt to build pkg(8). if [ ! -f ${PORTSDIR}/Makefile ]; then @@ -60,10 +58,10 @@ fi # Ensure the ports listed in _DVD_PACKAGES exist to sanitize the # final list. for _P in ${_DVD_PACKAGES}; do - if [ -d "${PORTSDIR}/${_P}" ]; then + if [ -d "${PORTSDIR}/${_P%%@*}" ]; then DVD_PACKAGES="${DVD_PACKAGES} ${_P}" else - echo "*** Skipping nonexistent port: ${_P}" + echo "*** Skipping nonexistent port: ${_P%%@*}" fi done