svn commit: r258770 - head/release

[Glen Barber]

On Sat, Nov 30, 2013 at 05:07:53PM +0000, Hiroki Sato wrote:
> Author: hrs
> Date: Sat Nov 30 17:07:53 2013
> New Revision: 258770
> URL: http://svnweb.freebsd.org/changeset/base/258770
> 
> Log:
>   Add NOPKG to disable pkg-stage.
> 
> Modified:
>   head/release/Makefile
> 
> Modified: head/release/Makefile
> ==============================================================================
> --- head/release/Makefile	Sat Nov 30 16:26:04 2013	(r258769)
> +++ head/release/Makefile	Sat Nov 30 17:07:53 2013	(r258770)
> @@ -16,6 +16,7 @@
>  #            (by default, the directory above this one) 
>  #  PORTSDIR: location of ports tree to distribute (default: /usr/ports)
>  #  DOCDIR:   location of doc tree (default: /usr/doc)
> +#  NOPKG:    if set, do not distribute third-party packages
>  #  NOPORTS:  if set, do not distribute ports tree
>  #  NOSRC:    if set, do not distribute source tree
>  #  NODOC:    if set, do not generate release documentation
> @@ -212,7 +213,7 @@ packagesystem: base.txz kernel.txz ${EXT
>  	touch ${.TARGET}
>  
>  pkg-stage:
> -.if(exists(${.CURDIR}/${TARGET}/pkg-stage.conf))
> +.if !defined(NOPKG) && exists(${.CURDIR}/${TARGET}/pkg-stage.conf)
>  	sh ${.CURDIR}/scripts/pkg-stage.sh ${.CURDIR}/${TARGET}/pkg-stage.conf \
>  		${REVISION}
>  .endif

pkg-stage is not (or should not) be called by itself.  It is used by
the 'dvdrom' target.  Is the intent here to disable package fetching
while still creating the dvdrom?

Glen

-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 834 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-src-head/attachments/20131130/1a4478d5/attachment.sig>