diff options
| author | gjb <gjb@FreeBSD.org> | 2013-12-12 05:49:27 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2013-12-12 05:49:27 +0000 |
| commit | 783b09fc441f18dfeee609cc16680073c01fd2f1 (patch) | |
| tree | 1d35befb3d30fa5667f9dece99009e89ff6a0022 | |
| parent | 2ff1272b663fd756ec8d33f3348a9f8ee2eee997 (diff) | |
| download | FreeBSD-src-783b09fc441f18dfeee609cc16680073c01fd2f1.zip FreeBSD-src-783b09fc441f18dfeee609cc16680073c01fd2f1.tar.gz | |
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
| -rwxr-xr-x | release/scripts/pkg-stage.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/release/scripts/pkg-stage.sh b/release/scripts/pkg-stage.sh index 93768ff..3781f77 100755 --- a/release/scripts/pkg-stage.sh +++ b/release/scripts/pkg-stage.sh @@ -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 |
