D45278.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D45278.diff
View Options

	diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh
	--- a/release/scripts/pkg-stage.sh
	+++ b/release/scripts/pkg-stage.sh
	@@ -12,9 +12,7 @@
	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 @@
	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 @@
	# 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