From owner-svn-src-head@FreeBSD.ORG Mon Nov 18 20:36:06 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 DC62A296; Mon, 18 Nov 2013 20:36:05 +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 1256325E3; Mon, 18 Nov 2013 20:36:03 +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 rAIKZks3051497 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 19 Nov 2013 05:35:56 +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 rAIKZije081357; Tue, 19 Nov 2013 05:35:46 +0900 (JST) (envelope-from hrs@FreeBSD.org) Date: Tue, 19 Nov 2013 05:29:24 +0900 (JST) Message-Id: <20131119.052924.2179352866091983302.hrs@allbsd.org> To: gjb@FreeBSD.org Subject: Re: svn commit: r258310 - head/release From: Hiroki Sato In-Reply-To: <20131118195506.GT1643@glenbarber.us> References: <201311181625.rAIGPuRG078815@svn.freebsd.org> <20131119.034852.1148136397426813684.hrs@allbsd.org> <20131118195506.GT1643@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(Tue_Nov_19_05_29_24_2013_048)--" 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 05:35:56 +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: Mon, 18 Nov 2013 20:36:06 -0000 ----Security_Multipart(Tue_Nov_19_05_29_24_2013_048)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Glen Barber wrote in <20131118195506.GT1643@glenbarber.us>: gj> > gj> -export PKG_ABI="freebsd:$(echo ${REVISION} | tr -d '.0'):x86:64" gj> > gj> +export PKG_ABI="freebsd:$(echo ${REVISION} | sed -e 's/\.[0-9]//'):x86:64" gj> > gj> > PKG_ABI=freebsd:${REVISION%.[0-9]*}:x86:64 is simpler than invoking gj> > tr or sed. However, pkg-stage.sh should have a mapping rule from gj> > TARGET and TARGET_ARCH, not in arch specific config files, I think. gj> > Other than the package list, variables are not arch-specific. gj> > gj> The pkg(8) ABI does not map directly to anything we use ('amd64' or gj> 'i386') unfortunately. Yes, it is true that it does not map TARGET/TARGET_ARCH directly. What I mean is that it can be easily translated in pkg-stage.sh by adding a mapping rule there like this: case ${TARGET}:{TARGET_ARCH} in amd64:*) PKG_ABI=x86:64 ;; ... esac Depending files in arch-specific directory makes maintenance difficult when the number of archs and combinations of TARGET/TARGET_ARCH increase. It can happen when arm and mips are handled in make release and the package server. Eliminating/reducing manually-configured variables which can be derived from other ones is always a good practice. gj> > Does this guarantee that the packages downloaded by pkg(8) are for a gj> > specific release? And I think fetching packages can be done just gj> > after svn co stage in release.sh. Collecting up necessity of network gj> > access (including fetching distfiles for docproj) before entering the gj> > chroot environment makes redoing the release build easier. gj> > gj> gj> I don't think it has been discussed yet where packages built for gj> a specific release will exist. Anyway, I would like to avoid directory gj> hierarchy pollution outside of the dvd/ directory, this is why I use it gj> for PKG_CACHEDIR directly. So I think it should be discussed and we should make the script to consistently fetch the package set built from the release branch (or head for stable or snapshots) in the ports tree. While I guess the current one simply fetches the latest packages, the release iso images must have packages which correspond to ports.txz. -- Hiroki ----Security_Multipart(Tue_Nov_19_05_29_24_2013_048)-- Content-Type: application/pgp-signature Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (FreeBSD) iEYEABECAAYFAlKKeKQACgkQTyzT2CeTzy3gPgCgmdpEiKdLKONFFlVmHhTgdynD Q5kAniwclnQUjGn7b1Vx7NFbVhkmAd37 =dWpu -----END PGP SIGNATURE----- ----Security_Multipart(Tue_Nov_19_05_29_24_2013_048)----