svn commit: r320748 - head/release

[Glen Barber]

On Thu, Jul 06, 2017 at 05:54:04PM +0000, Glen Barber wrote:
> 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/
> 

Err, the commit message is backwards.  The intent here is to enable
*un*-setting NOPKG when it is defined but empty.

Glen

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-src-head/attachments/20170706/775b15fb/attachment.sig>