Author: gjb
Date: Thu Dec 12 05:49:27 2013
New Revision: 259246
URL: http://svnweb.freebsd.org/changeset/base/259246
Log:
Prevent release build errors found during snapshot builds where if
NOPORTS=1, pkg-stage.sh cannot build the ports-mgmt/pkg port if
WITH_DVD=1.
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
Modified:
head/release/scripts/pkg-stage.sh
Modified: head/release/scripts/pkg-stage.sh
==============================================================================
--- head/release/scripts/pkg-stage.sh Thu Dec 12 04:12:19 2013
(r259245)
+++ head/release/scripts/pkg-stage.sh Thu Dec 12 05:49:27 2013
(r259246)
@@ -24,6 +24,11 @@ fi
REVISION="${2}"
. "${1}" || exit 1
+# If NOPORTS is set for the release, do not attempt to build pkg(8).
+if [ ! -f /usr/ports/Makefile ]; then
+ exit 0
+fi
+
if [ ! -x /usr/local/sbin/pkg ]; then
/usr/bin/make -C /usr/ports/ports-mgmt/pkg install clean
fi
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
