svn commit: r258310 - head/release

[Hiroki Sato]

Glen Barber <gjb at FreeBSD.org> wrote
  in <201311181625.rAIGPuRG078815 at 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 at FreeBSD.org> wrote
  in <201311181752.rAIHqIQo009302 at 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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20131119/7c92b3af/attachment.sig>