Date: Sat, 30 Nov 2013 12:15:57 -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: <20131130171557.GI31807@glenbarber.us> In-Reply-To: <201311301707.rAUH7rRa028329@svn.freebsd.org> References: <201311301707.rAUH7rRa028329@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--5mZBmBd1ZkdwT1ny Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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 >=20 > Log: > Add NOPKG to disable pkg-stage. >=20 > Modified: > head/release/Makefile >=20 > Modified: head/release/Makefile > =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 > --- 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)=20 > # 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} > =20 > 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 --5mZBmBd1ZkdwT1ny Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) iQIcBAEBCAAGBQJSmh1NAAoJELls3eqvi17QUPEP/3xt2UybPLNNblOykaDu3nAP +VyTgZvnRhZd0+qt0phIsyc0FL0jP5PtAZ3X+2Lu6+pewcBC3fut/QNtdWeIgCe8 SEkqRr0feNMZJSCeOOLNQSdPc4dzzyx0F6uu5Greahr2Mcze7aqwr9PUkRVWjMrR DkFacYrGYKgQggpkqLP3w50v/RarH6x7FgiKd+0+rsFniZf2OP7T1dEesVd0xzLo U+W+TS0MDrbIVGBFAG+/UPFzZuztU4ZE9TLFL1au6D452OtgldZXlvTdWTwZ02r9 QiwTHd0hzoMHzqBFvRPTf8MBP7um/1zvvI8P7+NbYEqDOAlSRmpkO9cLLn5wwFZd i6cg1Igh2Oz206fdsuUVvZ4UiSdrf8ZTcZ31eNyE+qnzkM2emEGzu/+cFT5xtZe7 dd1t4TNRzMo7mTADnXqIKtUrgljYBHu4mTrGJo4FbPeVSuRpMxT6MVpgKKrwdhhM T1kvQSYVTaaFHhVACNgDL8fTWCwaX41OKu1kNkq63zavKVlrUVbT0TkJqHQ8l9ZO AD3iOUZxZDjJdTlaxK9TWF0wm18xi6K5ENH3RvVvTpVk+56kVzFotP2nwdy7Jvmh XggfQCxtjlMwbjmeRsrwKCBJWYeIFNnXCy05NFC0u7t4q5ig6P/IMim9ngi3lNiN Ye8a2uc5dQ2nB1XEH9nf =abbM -----END PGP SIGNATURE----- --5mZBmBd1ZkdwT1ny--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131130171557.GI31807>