Date: Sun, 01 Dec 2013 02:23:29 +0900 (JST) From: Hiroki Sato <hrs@FreeBSD.org> To: gjb@FreeBSD.org Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r258770 - head/release Message-ID: <20131201.022329.1080929305911200460.hrs@allbsd.org> In-Reply-To: <20131130171557.GI31807@glenbarber.us> References: <201311301707.rAUH7rRa028329@svn.freebsd.org> <20131130171557.GI31807@glenbarber.us>
next in thread | previous in thread | raw e-mail | index | archive | help
----Security_Multipart(Sun_Dec__1_02_23_29_2013_839)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Glen Barber <gjb@FreeBSD.org> wrote in <20131130171557.GI31807@glenbarber.us>: 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. -- Hiroki ----Security_Multipart(Sun_Dec__1_02_23_29_2013_839)-- Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (FreeBSD) iEYEABECAAYFAlKaHxEACgkQTyzT2CeTzy1mNwCfUMdb6weoPGYspew9KlFh81A1 GN4AoKkzKHVzLbcsnYqYDfoqviqAGlbV =lpHi -----END PGP SIGNATURE----- ----Security_Multipart(Sun_Dec__1_02_23_29_2013_839)----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131201.022329.1080929305911200460.hrs>