On Sun, Dec 01, 2013 at 02:23:29AM +0900, Hiroki Sato wrote: > Glen Barber <[email protected]> wrote > in <[email protected]>: > > gj> On Sat, Nov 30, 2013 at 05:07:53PM +0000, Hiroki Sato wrote: > gj> > Author: hrs > gj> > Date: Sat Nov 30 17:07:53 2013 > gj> > New Revision: 258770 > gj> > URL: http://svnweb.freebsd.org/changeset/base/258770 > gj> > > gj> > Log: > gj> > Add NOPKG to disable pkg-stage. > gj> > > gj> > Modified: > gj> > head/release/Makefile > gj> > > gj> > Modified: head/release/Makefile > gj> > > ============================================================================== > gj> > --- head/release/Makefile Sat Nov 30 16:26:04 2013 > (r258769) > gj> > +++ head/release/Makefile Sat Nov 30 17:07:53 2013 > (r258770) > gj> > @@ -16,6 +16,7 @@ > gj> > # (by default, the directory above this one) > gj> > # PORTSDIR: location of ports tree to distribute (default: /usr/ports) > gj> > # DOCDIR: location of doc tree (default: /usr/doc) > gj> > +# NOPKG: if set, do not distribute third-party packages > gj> > # NOPORTS: if set, do not distribute ports tree > gj> > # NOSRC: if set, do not distribute source tree > gj> > # NODOC: if set, do not generate release documentation > gj> > @@ -212,7 +213,7 @@ packagesystem: base.txz kernel.txz ${EXT > gj> > touch ${.TARGET} > gj> > > gj> > pkg-stage: > gj> > -.if(exists(${.CURDIR}/${TARGET}/pkg-stage.conf)) > gj> > +.if !defined(NOPKG) && exists(${.CURDIR}/${TARGET}/pkg-stage.conf) > gj> > sh ${.CURDIR}/scripts/pkg-stage.sh > ${.CURDIR}/${TARGET}/pkg-stage.conf \ > gj> > ${REVISION} > gj> > .endif > gj> > gj> pkg-stage is not (or should not) be called by itself. It is used by > gj> the 'dvdrom' target. Is the intent here to disable package fetching > gj> while still creating the dvdrom? > > Yes. It allows checking if the dvdrom target works fine without > fetching the packages. >
Got it. Thanks. Glen
pgpxcwaxSJcnr.pgp
Description: PGP signature
