Date: Tue, 17 Dec 2013 03:46:44 +0000 (UTC) From: Glen Barber <gjb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r259491 - stable/10/release/scripts Message-ID: <201312170346.rBH3ki0K067095@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gjb Date: Tue Dec 17 03:46:44 2013 New Revision: 259491 URL: http://svnweb.freebsd.org/changeset/base/259491 Log: MFC r259246: 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. Sponsored by: The FreeBSD Foundation Modified: stable/10/release/scripts/pkg-stage.sh Directory Properties: stable/10/ (props changed) Modified: stable/10/release/scripts/pkg-stage.sh ============================================================================== --- stable/10/release/scripts/pkg-stage.sh Tue Dec 17 03:38:36 2013 (r259490) +++ stable/10/release/scripts/pkg-stage.sh Tue Dec 17 03:46:44 2013 (r259491) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312170346.rBH3ki0K067095>