Date: Tue, 19 Nov 2013 03:48:52 +0900 (JST) From: Hiroki Sato <hrs@FreeBSD.org> To: gjb@FreeBSD.org Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r258310 - head/release Message-ID: <20131119.034852.1148136397426813684.hrs@allbsd.org> In-Reply-To: <201311181625.rAIGPuRG078815@svn.freebsd.org> <201311181752.rAIHqIQo009302@svn.freebsd.org> References: <201311181625.rAIGPuRG078815@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
----Security_Multipart(Tue_Nov_19_03_48_52_2013_088)-- Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Glen Barber <gjb@FreeBSD.org> 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 <gjb@FreeBSD.org> 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)----
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131119.034852.1148136397426813684.hrs>