From nobody Thu Aug 22 22:14:00 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 4WqctK2lYrz5Tl3p; Thu, 22 Aug 2024 22:14:01 +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 4WqctK10Smz4hWS; Thu, 22 Aug 2024 22:14:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1724364841; 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=VYpmeto7Wl04DN4sPTz+plT8V7Pq3yP/0RnVrx7teQY=; b=A3nr+IwP9BKIrrSkllSY+RibpuoCEf8dH4FLrg40XomeM560xWt4jX1600YysXdBGE4zx9 AE7mUporiIYsDJciUurrgWvxVNsG8eUrOlecEW4LKoPt7WVeXzHEhdygk9MfUV88Q6+O07 E3/n171PdU5DcxTgfTyufOmmU9rOWLDVVYCVcIPk/DSsinugLT4UY9Vf0gQOgjkJCeru8r H1CeDtAeftt17WFC2Cz48xc3iq4Zkvw94Frf9ZiMa4BNUkT59uY06h0otpBMJ8oJl5iDXP iqECANKdeJu5Eu417dzRtqugmbH++04q6oJMwbVwn+aMWjIphYhbkMU44XtdNw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724364841; a=rsa-sha256; cv=none; b=PNBmu+dSx5BiLHJe12ZiDfRLJjKZYG6KFL/Y/P4EpenAAd9rV+zkAmPRP6F8sdSDA6ANE4 6z38kJU4KRsA5mXWTecVaRsaENy4TG6qmm/pcaNNJKA4bk2OSERV+rs8pLYafTM9NCKE1M HXyJzPnwn02c6XWqBYrV4UfxmdI3FAKmbP4CMGo1R9bveMqw9O6fC0kKbYlzlVrrgOs3Ne Ml556uNqw2rYbW7FLyLhPns96LYW7b8LscWhSHFkdCDgukuGbeTEnoZp20V+n/Y9wSCc3j BX0A8IB+QBaMHNIkdnTnQ5vpXpkaz3JH551fQxoZsaxFv5+QhF7Wct/7TmpDeQ== 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=1724364841; 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=VYpmeto7Wl04DN4sPTz+plT8V7Pq3yP/0RnVrx7teQY=; b=nEUaIxfCm1IMu4G1+RGc4fuHuYLF/lFp29javV0iQFSbt4dVIP6fguwlj1UpI68OSsqrbO zkZNdPkgipyUAG6tqHDaaVu4mxE9JTc68t/pePbXUeeZaV/6yvg934co33CJzO6DtxK07x thdIFBdM3mrjobA8PVFzPyj7MqbUEfeCJbO8EvBARneSriAMh2HscLNVKL+ifVhSTHYzGO WhvAnND0cgt3B413/Ahds/Xbzg6Iuatebn+MKcxmN57krggfYKtAwu01xdXEUpLXWsn5GT EDcAJNdHMGf/PQ783jEGYiRRfKPFcaXnVpyy6QOKlFo0I73QcV4z/i3tY8n8YA== 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 4WqctK0cc1zlWT; Thu, 22 Aug 2024 22:14:01 +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 47MME0r4005701; Thu, 22 Aug 2024 22:14:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47MME0Fg005698; Thu, 22 Aug 2024 22:14:00 GMT (envelope-from git) Date: Thu, 22 Aug 2024 22:14:00 GMT Message-Id: <202408222214.47MME0Fg005698@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: 2006e3634b40 - releng/13.4 - 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/releng/13.4 X-Git-Reftype: branch X-Git-Commit: 2006e3634b402b76c13c3e834a91ff596ac6cbcd Auto-Submitted: auto-generated The branch releng/13.4 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=2006e3634b402b76c13c3e834a91ff596ac6cbcd commit 2006e3634b402b76c13c3e834a91ff596ac6cbcd Author: Colin Percival AuthorDate: 2024-05-20 17:42:49 +0000 Commit: Colin Percival CommitDate: 2024-08-22 22:01:22 +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. Approved by: re (cperciva) MFC after: 1 minute Differential Revision: https://reviews.freebsd.org/D45278 (cherry picked from commit a926bf9254b2a5a9c3b60cf1760fe7746584308b) --- 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