Author: gjb
Date: Thu Jul 6 18:46:33 2017
New Revision: 320753
URL: https://svnweb.freebsd.org/changeset/base/320753
Log:
MFC r320748:
Allow passing NOPKG= to make(1) to enable the pkg-stage target
from getting executed when NOPKG is defined but empty.
Approved by: re (kib, insta-MFC)
Sponsored by: The FreeBSD Foundation
Modified:
stable/10/release/Makefile
Directory Properties:
stable/10/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/release/Makefile
Directory Properties:
stable/11/ (props changed)
Modified: stable/10/release/Makefile
==============================================================================
--- stable/10/release/Makefile Thu Jul 6 18:33:33 2017 (r320752)
+++ stable/10/release/Makefile Thu Jul 6 18:46:33 2017 (r320753)
@@ -306,7 +306,7 @@ packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES}
touch ${.TARGET}
pkg-stage:
-.if !defined(NOPKG)
+.if !defined(NOPKG) || empty(NOPKG)
env PORTSDIR=${PORTSDIR} REPOS_DIR=${.CURDIR}/pkg_repos/ \
sh ${.CURDIR}/scripts/pkg-stage.sh
mkdir -p ${.OBJDIR}/dvd/packages/repos/
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "[email protected]"
