aboutsummaryrefslogtreecommitdiff
path: root/release/scripts
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2017-05-22 14:21:45 +0000
committerGlen Barber <gjb@FreeBSD.org>2017-05-22 14:21:45 +0000
commitfefd0439636bf1ed392a33a3a0ebd049296411c1 (patch)
treef6b4c579a42e28ba4c7b778df0539ddb0acc0249 /release/scripts
parentc820048f66b288452e657b66eff4f61864a5a89b (diff)
downloadsrc-fefd0439636bf1ed392a33a3a0ebd049296411c1.tar.gz
src-fefd0439636bf1ed392a33a3a0ebd049296411c1.zip
Allow PORTSDIR to be overridden in the pkg-stage target.
Submitted by: Johannes Jost Meixner (original) PR: 218393 MFC after: 3 days Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=318646
Diffstat (limited to 'release/scripts')
-rwxr-xr-xrelease/scripts/pkg-stage.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh
index dd26e4b79578..fe4ffd9695d0 100755
--- a/release/scripts/pkg-stage.sh
+++ b/release/scripts/pkg-stage.sh
@@ -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
@@ -33,8 +34,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
@@ -42,7 +43,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"
@@ -58,7 +59,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}"