From owner-svn-src-all@FreeBSD.ORG Mon Nov 18 18:49:22 2013 Return-Path: Delivered-To: svn-src-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B681297D; Mon, 18 Nov 2013 18:49:22 +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 AB1A52E99; Mon, 18 Nov 2013 18:49:21 +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 rAIIn2r5038926 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 19 Nov 2013 03:49:13 +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 rAIIn0DS080290; Tue, 19 Nov 2013 03:49:02 +0900 (JST) (envelope-from hrs@FreeBSD.org) Date: Tue, 19 Nov 2013 03:48:52 +0900 (JST) Message-Id: <20131119.034852.1148136397426813684.hrs@allbsd.org> To: gjb@FreeBSD.org Subject: Re: svn commit: r258310 - head/release From: Hiroki Sato In-Reply-To: <201311181625.rAIGPuRG078815@svn.freebsd.org> <201311181752.rAIHqIQo009302@svn.freebsd.org> References: <201311181625.rAIGPuRG078815@svn.freebsd.org> 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(Tue_Nov_19_03_48_52_2013_088)--" 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]); Tue, 19 Nov 2013 03:49:13 +0900 (JST) X-Spam-Status: No, score=-99.0 required=13.0 tests=CONTENT_TYPE_PRESENT, SPF_SOFTFAIL,USER_IN_WHITELIST,X_CHINESE_RELAY 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-all@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 18 Nov 2013 18:49:22 -0000 ----Security_Multipart(Tue_Nov_19_03_48_52_2013_088)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Glen Barber wrote in <201311181625.rAIGPuRG078815@svn.freebsd.org>: gj> Author: gjb gj> Date: Mon Nov 18 16:25:56 2013 gj> New Revision: 258310 gj> URL: http://svnweb.freebsd.org/changeset/base/258310 gj> gj> Log: gj> Add the 'dvd1.iso' target. This mimics the 'release.iso' target, gj> with the additional step of fetching packages for inclusion on the gj> dvd image. gj> gj> The 'pkg-stage' target is used to run 'scripts/pkg-stage.sh' if gj> the '${TARGET}/pkg-stage.conf' configuration file exists (currently gj> only amd64 and i386). gj> gj> Allow dvd1.iso to be skipped if NODVD=1. ... gj> +dvd: gj> +# Install system gj> + mkdir -p ${.TARGET} gj> + cd ${WORLDDIR} && ${IMAKE} installkernel installworld distribution \ gj> + DESTDIR=${.OBJDIR}/${.TARGET} WITHOUT_RESCUE=1 WITHOUT_KERNEL_SYMBOLS=1 \ gj> + WITHOUT_PROFILE=1 Please remove WITHOUT_PROFILE=1 here. Glen Barber wrote in <201311181752.rAIHqIQo009302@svn.freebsd.org>: gj> Modified: head/release/amd64/pkg-stage.conf gj> ============================================================================== gj> --- head/release/amd64/pkg-stage.conf Mon Nov 18 17:06:33 2013 (r258313) gj> +++ head/release/amd64/pkg-stage.conf Mon Nov 18 17:52:18 2013 (r258314) gj> @@ -3,7 +3,7 @@ gj> # $FreeBSD$ gj> # gj> gj> -export PKG_ABI="freebsd:$(echo ${REVISION} | tr -d '.0'):x86:64" gj> +export PKG_ABI="freebsd:$(echo ${REVISION} | sed -e 's/\.[0-9]//'):x86:64" PKG_ABI=freebsd:${REVISION%.[0-9]*}:x86:64 is simpler than invoking tr or sed. However, pkg-stage.sh should have a mapping rule from TARGET and TARGET_ARCH, not in arch specific config files, I think. Other than the package list, variables are not arch-specific. Does this guarantee that the packages downloaded by pkg(8) are for a specific release? And I think fetching packages can be done just after svn co stage in release.sh. Collecting up necessity of network access (including fetching distfiles for docproj) before entering the chroot environment makes redoing the release build easier. -- Hiroki ----Security_Multipart(Tue_Nov_19_03_48_52_2013_088)-- Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (FreeBSD) iEUEABECAAYFAlKKYRQACgkQTyzT2CeTzy3x4wCY9O9GcfWaF57VxCMpcyTMme3f KwCgokmS9lFwsO8iXqYDMSsgZ4C6CG4= =g1FS -----END PGP SIGNATURE----- ----Security_Multipart(Tue_Nov_19_03_48_52_2013_088)----