Date: Sat, 30 Nov 2013 12:27:59 -0500 From: Glen Barber <gjb@FreeBSD.org> To: Hiroki Sato <hrs@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: <20131130172759.GJ31807@glenbarber.us> In-Reply-To: <20131201.022329.1080929305911200460.hrs@allbsd.org> References: <201311301707.rAUH7rRa028329@svn.freebsd.org> <20131130171557.GI31807@glenbarber.us> <20131201.022329.1080929305911200460.hrs@allbsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--FnOKg9Ah4tDwTfQS Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Dec 01, 2013 at 02:23:29AM +0900, Hiroki Sato wrote: > Glen Barber <gjb@FreeBSD.org> wrote > in <20131130171557.GI31807@glenbarber.us>: >=20 > 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> > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D > 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/p= orts) > 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= =2Econf \ > 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? >=20 > Yes. It allows checking if the dvdrom target works fine without > fetching the packages. >=20 Got it. Thanks. Glen --FnOKg9Ah4tDwTfQS Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) iQIcBAEBCAAGBQJSmiAfAAoJELls3eqvi17QRLkQANJWz5IIoi9N273RSgCe9Lpc sOGg1nXY+HkJFnc0NfXS3SQ1VLwUB0GbsNlU8476i2Ej5L19gmEtsUAosGGGlStl YNu3S9SCgEjXIHjrsKnjwN8XraDFNQcy4iIhFjDEDBHtrrCNfwLAS07j9m/wtJrc yhWNdz8YywjKZ+HBKmB1U98O2R0NKy2K0g23fhc8B46Gl5fBay+jelZFqafdW3GC bEzG4WXGn7a9MjJavVDrVSV9EE7xOWFwSUXqmIyL65wJ2ngvf0wBNiN5YF2qNB2E W4012OumCKZhhEXFGYdL66FCyTV7wAm5rhNeW+6x7UTb/gvjwHdksZGKq7KIM3n7 URtoxvpCMyJHBFxH4ztD+9lK440k4h0vSf/m4l5IWrskQrAdZNnD2Gcigo+TeYv4 wr9HTrxpZGGV/QWO9Iznce5deviLzS4j18czj2FRwrhxjo13/7YxO5OmztI4G5oc CvIiCtgqjSJctNdCJVZX6Y8SxT102DQs88hZIId78IvHDBPbNOsBKmcDON8nQDAe 3sFxErdmWA6fjsRYpl5WGRAYVJuCdGixQQTTSvS8GdF3F8nRkFlV8e8xTOZH3mWL 7mpJSqHRL6VudpoxDF6aI08RJf02QF9rpFoWORIg79uCLo0WzXKUjWU4l4S7w7yi 7XsEqk1ZtVjIoG6XPZ9p =CsKQ -----END PGP SIGNATURE----- --FnOKg9Ah4tDwTfQS--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131130172759.GJ31807>