From nobody Fri May 24 00:02: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 4Vllb0536rz5Lch0; Fri, 24 May 2024 00:02:04 +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 4Vllb04XX3z4WHw; Fri, 24 May 2024 00:02:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716508924; 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=G4ToXFb6AWpSjfpXpcRn+BZWQwHQZV0mwx7vgvCKWxs=; b=QQOmVESWrLP357NzyYxb6SPuoKuhc4AzQfLwPyg8GIrsw9o3LV3H1XEispfVWOwq731P9W ofS0QQnFmvNoGcjRACyApx+u+/1sfXHWIncbI/8cSe+ZNXytzilAxr/BJmqeYa9MzkxiBZ 1Xh54KbU8vZEmxZ+MH2As7cOVMA1sa/26zWWzIn0yD6BUqGk84/TsxSok+ORMlP5iTTd2N aog+b7n/J7GvV2XKp8Tsb2O3GOoDOn7/t9rthvjD5bP4K5FMmLz7k3prRRRY4Xf1snTbce 0xW/JsdciaWsXefi/XG0VJ9x61L6pJakArgDRbsls4/Ixd4L16eiqJCOF3zrng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716508924; a=rsa-sha256; cv=none; b=Q0/3z1LvCXuwasqJTdeVpplfAzgrHTEbhlKCSepCeIGy5U2K0qRUFVKmMhtuy+O0jgfAuj 3e9h4KsR7j/e95mnYs+zjgPifELodiH1AGP3eglP0nvPZRBuFYkW7ZEaX7m8VWfqGrH7mG BccDvrxuPSoY6GwTuxCBq1/CGvvP4c1jGD3lnSxvh3EDZPQKFAYXGQfqnoNFHJ4H+EFrGP R9fxRwXOmXoQFn4SC8xIgUTPpH3/Axbaznup1GiUOeMyqE8BZc1ud+W1tko34V52X9DjPY fqLSq/VzQHRcH/R6E/Dy7tgN6St8vuJWYSNdOl9gy3RlOTwJYZPKeRe74yTpCQ== 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=1716508924; 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=G4ToXFb6AWpSjfpXpcRn+BZWQwHQZV0mwx7vgvCKWxs=; b=QrcbF3X7K4B1nk4xHM12cU9jVfKD7H2ljpnQx+CXTWf4cItYCrE3KwLPvXDj312t4cxQiK XvERY2vuMZ99nObgYbECmJufAxMjGnvIu2pw4mHu4oT5Xprv/aMho6ZPLiPCfqj0l8nPpw 4QWnZvEK7lBXWURZ3F8ZVWTYRYZhILZZFo+kQyMnk+rcmIMzDVqcHBWVEfYospxbpXcRt8 WBR/UdphJA0YID0ZeSKAxrAjeS/5IKfFdXBzhPhfYjw3hMQ8fyBZP+1ZQq8BkZ8ZmTsktK aEmft9QXKL9HbkVog3h1saMxHnTmhssQ1ItRSxsDENjdW6CEELzkVBVdyQaTAQ== 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 4Vllb047sDz198P; Fri, 24 May 2024 00:02: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 44O024Ix026676; Fri, 24 May 2024 00:02:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44O0243G026673; Fri, 24 May 2024 00:02:04 GMT (envelope-from git) Date: Fri, 24 May 2024 00:02:04 GMT Message-Id: <202405240002.44O0243G026673@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: d31ed58b9f93 - main - 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/main X-Git-Reftype: branch X-Git-Commit: d31ed58b9f9360cecd9acfbd12999190edca6e56 Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=d31ed58b9f9360cecd9acfbd12999190edca6e56 commit d31ed58b9f9360cecd9acfbd12999190edca6e56 Author: Colin Percival AuthorDate: 2024-05-20 17:42:49 +0000 Commit: Colin Percival CommitDate: 2024-05-24 00:01:59 +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. 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 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