svn commit: r259861 - stable/10/release

[Glen Barber]

Author: gjb
Date: Wed Dec 25 06:09:07 2013
New Revision: 259861
URL: http://svnweb.freebsd.org/changeset/base/259861

Log:
  MFC r259729:
    Bootstrap etcupdate(8) as part of the release build, similar
    to what is done for mergemaster(8).  This allows etcupdate(8)
    to work out-of-box after the first upgrade of a system.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/release/Makefile
==============================================================================
--- stable/10/release/Makefile	Wed Dec 25 04:51:56 2013	(r259860)
+++ stable/10/release/Makefile	Wed Dec 25 06:09:07 2013	(r259861)
@@ -104,6 +104,8 @@ base.txz:
 # Set up mergemaster root database
 	sh ${.CURDIR}/scripts/mm-mtree.sh -m ${WORLDDIR} -F \
 	    "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" -D "${.OBJDIR}/${DISTDIR}/base"
+	etcupdate extract -B -M "TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" \
+	    -d "${.OBJDIR}/${DISTDIR}/base/var/db/etcupdate"
 # Package all components
 	cd ${WORLDDIR} && ${IMAKE} packageworld DISTDIR=${.OBJDIR}/${DISTDIR}
 	mv ${DISTDIR}/*.txz .