svn commit: r318853 - in stable: 10/release 10/release/scripts 11/release 11/release/scripts

[Glen Barber]

Author: gjb
Date: Thu May 25 01:45:43 2017
New Revision: 318853
URL: https://svnweb.freebsd.org/changeset/base/318853

Log:
  MFC r318646:
   Allow PORTSDIR to be overridden in the pkg-stage target.
  
  PR:		218393
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/Makefile
  stable/10/release/scripts/pkg-stage.sh
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/release/Makefile
  stable/11/release/scripts/pkg-stage.sh
Directory Properties:
  stable/11/   (props changed)

Modified: stable/10/release/Makefile
==============================================================================
--- stable/10/release/Makefile	Thu May 25 01:43:39 2017	(r318852)
+++ stable/10/release/Makefile	Thu May 25 01:45:43 2017	(r318853)
@@ -307,7 +307,7 @@ packagesystem: base.txz kernel.txz ${EXT
 
 pkg-stage:
 .if !defined(NOPKG)
-	env REPOS_DIR=${.CURDIR}/pkg_repos/ \
+	env PORTSDIR=${PORTSDIR} REPOS_DIR=${.CURDIR}/pkg_repos/ \
 		sh ${.CURDIR}/scripts/pkg-stage.sh
 	mkdir -p ${.OBJDIR}/dvd/packages/repos/
 	cp ${.CURDIR}/scripts/FreeBSD_install_cdrom.conf \

Modified: stable/10/release/scripts/pkg-stage.sh
==============================================================================
--- stable/10/release/scripts/pkg-stage.sh	Thu May 25 01:43:39 2017	(r318852)
+++ stable/10/release/scripts/pkg-stage.sh	Thu May 25 01:45:43 2017	(r318853)
@@ -10,6 +10,7 @@ export PKG_DBDIR="/tmp/pkg"
 export PERMISSIVE="YES"
 export REPO_AUTOUPDATE="NO"
 export PKGCMD="/usr/sbin/pkg -d"
+export PORTSDIR="${PORTSDIR:-/usr/ports}"
 
 _DVD_PACKAGES="archivers/unzip
 devel/subversion
@@ -32,8 +33,8 @@ x11/kde4
 x11/xorg"
 
 # If NOPORTS is set for the release, do not attempt to build pkg(8).
-if [ ! -f /usr/ports/Makefile ]; then
-	echo "*** /usr/ports is missing!    ***"
+if [ ! -f ${PORTSDIR}/Makefile ]; then
+	echo "*** ${PORTSDIR} is missing!    ***"
 	echo "*** Skipping pkg-stage.sh     ***"
 	echo "*** Unset NOPORTS to fix this ***"
 	exit 0
@@ -41,7 +42,7 @@ fi
 
 if [ ! -x /usr/local/sbin/pkg ]; then
 	/etc/rc.d/ldconfig restart
-	/usr/bin/make -C /usr/ports/ports-mgmt/pkg install clean
+	/usr/bin/make -C ${PORTSDIR}/ports-mgmt/pkg install clean
 fi
 
 export DVD_DIR="dvd/packages"
@@ -57,7 +58,7 @@ fi
 # Ensure the ports listed in _DVD_PACKAGES exist to sanitize the
 # final list.
 for _P in ${_DVD_PACKAGES}; do
-	if [ -d "/usr/ports/${_P}" ]; then
+	if [ -d "${PORTSDIR}/${_P}" ]; then
 		DVD_PACKAGES="${DVD_PACKAGES} ${_P}"
 	else
 		echo "*** Skipping nonexistent port: ${_P}"