Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 11 Mar 2014 12:24:20 +0000 (UTC)
From:      John Hay <jhay@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject:   svn commit: r263016 - stable/9/release
Message-ID:  <201403111224.s2BCOKsX071210@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jhay
Date: Tue Mar 11 12:24:19 2014
New Revision: 263016
URL: http://svnweb.freebsd.org/changeset/base/263016

Log:
  MFC r262036:
  
  etcupdate should use the src tree from where the release is built, not
  the default (/usr/src) tree.

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

Modified: stable/9/release/Makefile
==============================================================================
--- stable/9/release/Makefile	Tue Mar 11 12:04:58 2014	(r263015)
+++ stable/9/release/Makefile	Tue Mar 11 12:24:19 2014	(r263016)
@@ -105,7 +105,7 @@ base.txz:
 	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"
+	    -s ${WORLDDIR} -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?201403111224.s2BCOKsX071210>