From owner-svn-src-head@FreeBSD.ORG Sat Nov 30 17:25:13 2013 Return-Path: Delivered-To: svn-src-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A49F9730; Sat, 30 Nov 2013 17:25:13 +0000 (UTC) Received: from mail.allbsd.org (gatekeeper.allbsd.org [IPv6:2001:2f0:104:e001::32]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 970651E2F; Sat, 30 Nov 2013 17:25:12 +0000 (UTC) Received: from alph.d.allbsd.org (p4181-ipbf1307funabasi.chiba.ocn.ne.jp [123.225.173.181]) (authenticated bits=128) by mail.allbsd.org (8.14.5/8.14.5) with ESMTP id rAUHOsHT081460 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sun, 1 Dec 2013 02:25:05 +0900 (JST) (envelope-from hrs@FreeBSD.org) Received: from localhost (localhost [IPv6:::1]) (authenticated bits=0) by alph.d.allbsd.org (8.14.7/8.14.5) with ESMTP id rAUHOqq2015534; Sun, 1 Dec 2013 02:24:54 +0900 (JST) (envelope-from hrs@FreeBSD.org) Date: Sun, 01 Dec 2013 02:23:29 +0900 (JST) Message-Id: <20131201.022329.1080929305911200460.hrs@allbsd.org> To: gjb@FreeBSD.org Subject: Re: svn commit: r258770 - head/release From: Hiroki Sato In-Reply-To: <20131130171557.GI31807@glenbarber.us> References: <201311301707.rAUH7rRa028329@svn.freebsd.org> <20131130171557.GI31807@glenbarber.us> X-PGPkey-fingerprint: BDB3 443F A5DD B3D0 A530 FFD7 4F2C D3D8 2793 CF2D X-Mailer: Mew version 6.5 on Emacs 24.3 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Multipart/Signed; protocol="application/pgp-signature"; micalg=pgp-sha1; boundary="--Security_Multipart(Sun_Dec__1_02_23_29_2013_839)--" Content-Transfer-Encoding: 7bit X-Virus-Scanned: clamav-milter 0.97.4 at gatekeeper.allbsd.org X-Virus-Status: Clean X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7 (mail.allbsd.org [133.31.130.32]); Sun, 01 Dec 2013 02:25:05 +0900 (JST) X-Spam-Status: No, score=-99.1 required=13.0 tests=CONTENT_TYPE_PRESENT, SPF_SOFTFAIL,USER_IN_WHITELIST autolearn=no version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on gatekeeper.allbsd.org Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Nov 2013 17:25:13 -0000 ----Security_Multipart(Sun_Dec__1_02_23_29_2013_839)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Glen Barber 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)----