svn commit: r260115 - stable/9/release

Glen Barber gjb at FreeBSD.org
Tue Dec 31 00:21:16 UTC 2013


Author: gjb
Date: Tue Dec 31 00:21:15 2013
New Revision: 260115
URL: http://svnweb.freebsd.org/changeset/base/260115

Log:
  Revert r259862:
    Don't try to bootstrap a utility that does not exist in the branch.
  
  Pointyhat:	 gjb
  Submitted by:	 John W. O'Brien (via -stable@)
  Sponsored by:	The FreeBSD Foundation

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

Modified: stable/9/release/Makefile
==============================================================================
--- stable/9/release/Makefile	Mon Dec 30 23:46:35 2013	(r260114)
+++ stable/9/release/Makefile	Tue Dec 31 00:21:15 2013	(r260115)
@@ -103,8 +103,6 @@ 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 .


More information about the svn-src-stable-9 mailing list