Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 6 Jul 2017 17:54:04 +0000 (UTC)
From:      Glen Barber <gjb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r320748 - head/release
Message-ID:  <201707061754.v66Hs4kL025965@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gjb
Date: Thu Jul  6 17:54:03 2017
New Revision: 320748
URL: https://svnweb.freebsd.org/changeset/base/320748

Log:
  Allow passing NOPKG= to make(1) to prevent the pkg-stage target
  from getting executed.
  
  MFC after:	3 days
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/Makefile

Modified: head/release/Makefile
==============================================================================
--- head/release/Makefile	Thu Jul  6 17:34:53 2017	(r320747)
+++ head/release/Makefile	Thu Jul  6 17:54:03 2017	(r320748)
@@ -269,7 +269,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/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201707061754.v66Hs4kL025965>