d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow PORTSDIR to be overridden in the pkg-stage target.

Browse Source 
Submitted by:	Johannes Jost Meixner (original)
PR:		218393
MFC after:	3 days
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
gjb 2017-05-22 14:21:45 +00:00
parent bea40ce7db
commit 5aa059cf90
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/Makefile
View File

@ -270,7 +270,7 @@ packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES}
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 \

9
release/scripts/pkg-stage.sh
View File

@ -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}"