Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 22 Dec 2013 16:12:47 +0000 (UTC)
From:      Glen Barber <gjb@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r259729 - head/release
Message-ID:  <201312221612.rBMGCl6k023511@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gjb
Date: Sun Dec 22 16:12:47 2013
New Revision: 259729
URL: http://svnweb.freebsd.org/changeset/base/259729

Log:
  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.
  
  Submitted by:	jhb
  MFC after:	3 days
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/release/Makefile

Modified: head/release/Makefile
==============================================================================
--- head/release/Makefile	Sun Dec 22 16:09:29 2013	(r259728)
+++ head/release/Makefile	Sun Dec 22 16:12:47 2013	(r259729)
@@ -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 .



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312221612.rBMGCl6k023511>