Attachment #181503 for bug #218393

View | Details | Raw Unified | Return to bug 218393
Collapse All | Expand All

Lines 284-290 packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES} Link Here

(-)b/release/Makefile (-1 / +1 lines)
284		284
285	pkg-stage:	285	pkg-stage:
286	.if !defined(NOPKG)	286	.if !defined(NOPKG)
287	env REPOS_DIR=${.CURDIR}/pkg_repos/ \	287	env PORTSDIR=${PORTSDIR} REPOS_DIR=${.CURDIR}/pkg_repos/ \
288	sh ${.CURDIR}/scripts/pkg-stage.sh	288	sh ${.CURDIR}/scripts/pkg-stage.sh
289	mkdir -p ${.OBJDIR}/dvd/packages/repos/	289	mkdir -p ${.OBJDIR}/dvd/packages/repos/
290	cp ${.CURDIR}/scripts/FreeBSD_install_cdrom.conf \	290	cp ${.CURDIR}/scripts/FreeBSD_install_cdrom.conf \

Lines 5-11 Link Here

(-)b/release/scripts/FreeBSD_install_cdrom.conf (-1 / +1 lines)
5	#	5	#
6		6
7	FreeBSD_install_cdrom: {	7	FreeBSD_install_cdrom: {
8	url: "file:///dist/packages/${ABI}",	8	url: "file:///packages/${ABI}",
9	mirror_type: "none",	9	mirror_type: "none",
10	enabled: yes	10	enabled: yes
11	}	11	}




export PERMISSIVE="YES"
export REPO_AUTOUPDATE="NO"
export PKGCMD="/usr/sbin/pkg -d"
export PORTSDIR="${PORTSDIR:-/usr/ports}

_DVD_PACKAGES="archivers/unzip
devel/git

x11/xorg"

# If NOPORTS is set for the release, do not attempt to build pkg(8).
if [ ! -f ${PORTSDIR}/Makefile ]; then
	echo "*** ${PORTSDIR} is missing!    ***"
	echo "*** Skipping pkg-stage.sh     ***"
	echo "*** Unset NOPORTS to fix this ***"
	exit 0


if [ ! -x /usr/local/sbin/pkg ]; then
	/etc/rc.d/ldconfig restart
	/usr/bin/make -C ${PORTSDIR}/ports-mgmt/pkg install clean
fi

export DVD_DIR="dvd/packages"

# Ensure the ports listed in _DVD_PACKAGES exist to sanitize the
# final list.
for _P in ${_DVD_PACKAGES}; do
	if [ -d "${PORTSDIR}/${_P}" ]; then
		DVD_PACKAGES="${DVD_PACKAGES} ${_P}"
	else
		echo "*** Skipping nonexistent port: ${_P}"

Return to bug 218393

Lines 10-15 export PKG_DBDIR="/tmp/pkg" Link Here

(-)b/release/scripts/pkg-stage.sh (-4 / +5 lines)
10	export PERMISSIVE="YES"	10	export PERMISSIVE="YES"
11	export REPO_AUTOUPDATE="NO"	11	export REPO_AUTOUPDATE="NO"
12	export PKGCMD="/usr/sbin/pkg -d"	12	export PKGCMD="/usr/sbin/pkg -d"
		13	export PORTSDIR="${PORTSDIR:-/usr/ports}
13		14
14	_DVD_PACKAGES="archivers/unzip	15	_DVD_PACKAGES="archivers/unzip
15	devel/git	16	devel/git
Lines 33-40 x11/kde4 Link Here
33	x11/xorg"	34	x11/xorg"
34		35
35	# If NOPORTS is set for the release, do not attempt to build pkg(8).	36	# If NOPORTS is set for the release, do not attempt to build pkg(8).
36	if [ ! -f /usr/ports/Makefile ]; then	37	if [ ! -f ${PORTSDIR}/Makefile ]; then
37	echo "* /usr/ports is missing! *"	38	echo "* ${PORTSDIR} is missing! *"
38	echo "* Skipping pkg-stage.sh *"	39	echo "* Skipping pkg-stage.sh *"
39	echo "* Unset NOPORTS to fix this *"	40	echo "* Unset NOPORTS to fix this *"
40	exit 0	41	exit 0
Lines 42-48 fi Link Here
42		43
43	if [ ! -x /usr/local/sbin/pkg ]; then	44	if [ ! -x /usr/local/sbin/pkg ]; then
44	/etc/rc.d/ldconfig restart	45	/etc/rc.d/ldconfig restart
45	/usr/bin/make -C /usr/ports/ports-mgmt/pkg install clean	46	/usr/bin/make -C ${PORTSDIR}/ports-mgmt/pkg install clean
46	fi	47	fi
47		48
48	export DVD_DIR="dvd/packages"	49	export DVD_DIR="dvd/packages"
Lines 58-64 fi Link Here
58	# Ensure the ports listed in _DVD_PACKAGES exist to sanitize the	59	# Ensure the ports listed in _DVD_PACKAGES exist to sanitize the
59	# final list.	60	# final list.
60	for _P in ${_DVD_PACKAGES}; do	61	for _P in ${_DVD_PACKAGES}; do
61	if [ -d "/usr/ports/${_P}" ]; then	62	if [ -d "${PORTSDIR}/${_P}" ]; then
62	DVD_PACKAGES="${DVD_PACKAGES} ${_P}"	63	DVD_PACKAGES="${DVD_PACKAGES} ${_P}"
63	else	64	else
64	echo "*** Skipping nonexistent port: ${_P}"	65	echo "*** Skipping nonexistent port: ${_P}"