From nobody Fri May 24 00:13:04 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 4Vllqj0hdFz5LdWs; Fri, 24 May 2024 00:13:05 +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 4Vllqh73ykz4YXg; Fri, 24 May 2024 00:13:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716509585; 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=6HQhFVAWha89bk8/HWdMmTcjKv6CO6WcyZu/VEwUKMs=; b=Jn8vqDcYaZq0KptqhmVowK7dYCei7FGnbfR9YKCMghc8ufOxge4LUPNAXrdxrRx6DQDPeK 1Gm2U7urrZAy9bIcC5ZzwxAVRVrIxIBKyqIdZss+qSQb2035eYp2vsetkysmCD9u45z0Ap FWAod2/OnhMvowL4vHtCOWSKP+PDWR9i/nXlxAfLiGbJOR9lVlCLROH1jt8kMQ768AORrX 9xJHGqiP+WXIxelsdda5ufTCC7tGK4A4ZpJOb43aWQZvSyKJX397AZptLGEITOl5e0fFB9 /Gyi6mLMil1nVSq2eNkxLA3lrEOrftAr5qZ/DRkrA7ctmgjj5dC9ORBax8vyWw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716509585; a=rsa-sha256; cv=none; b=B7MY0JA4NqSc85WuzVOnb3uUaZ28vzs/6qCXbbuBFoNDE223B3+ki8NEp5uUIZ8WRHfg2i r60nUgqMV8O7KucFB3dUkIJB4/b0+LKIeex0SLpfpPs8DFd/7lhdYBZHqVYP5a5FLyXjBG LLqcEm6XKKym+wKi8IvGWeAAPeWZM5bzYy6odI612H+hdkW8hvr/nBlxfblot9S3n44qjF MVA+ktJpwyhj2U+SfzpP5tZDZwEmx3kFIoXmieFytQJJ47EBaRUkVd1l8xbx2bsuJphYB7 vLoxR9RBQwZeGpfOh7oWGml5MJf3DQIR73ChdykR0jhhBh7h6HqxwnNqo8nJUA== 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=1716509585; 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=6HQhFVAWha89bk8/HWdMmTcjKv6CO6WcyZu/VEwUKMs=; b=OyaYwgFfjLiHG8MNwY+2fhLbfJvULDO+VGXgufHXp+6J7Igd1C7qZrqlBwkORNeaM+AME8 m227wtpiB658Rx8+r1huD1hxRbhhvBAKjsXkZiQD5iM5AX1Tx2Oqq/m6PSXuGgbpgsqVPj Zh3RPe644+w/tfFpK9vsw3r0GNzwPnmhU2VgsG1NixKFGz6HDTsePIB/bok54blZ3Kxn5q zyEpK3uQ1D5jdv1hT9tWwUdM7mV3VgwOcNgX84CwVzpJiP/ICL76Vr4xUmVWppogxr1mBq +UC646b7sQXcO7IhepQEJYSX4jKPtPZWxF0dWiflMi/glCAoREEIX1BQoudTRQ== 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 4Vllqh6hM6z19gJ; Fri, 24 May 2024 00:13:04 +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 44O0D4aC043831; Fri, 24 May 2024 00:13:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44O0D4gN043828; Fri, 24 May 2024 00:13:04 GMT (envelope-from git) Date: Fri, 24 May 2024 00:13:04 GMT Message-Id: <202405240013.44O0D4gN043828@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: 8f7da18ea248 - releng/14.1 - 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/14.1 X-Git-Reftype: branch X-Git-Commit: 8f7da18ea2482e49bab7021ad759b4ca17366369 Auto-Submitted: auto-generated The branch releng/14.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=8f7da18ea2482e49bab7021ad759b4ca17366369 commit 8f7da18ea2482e49bab7021ad759b4ca17366369 Author: Colin Percival AuthorDate: 2024-05-20 17:42:49 +0000 Commit: Colin Percival CommitDate: 2024-05-24 00:08:37 +0000 Modernize DVD package set in preparation for 14.1 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 d31ed58b9f9360cecd9acfbd12999190edca6e56) (cherry picked from commit 0543cdc36ac6c91dccc2f1c5ae1df42c6d4d2a1d) --- 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 551876eca8c6..5742f84b0258 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -12,9 +12,7 @@ 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 graphics/drm-515-kmod @@ -22,19 +20,19 @@ 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 @@ -61,10 +59,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