From owner-svn-src-all@FreeBSD.ORG  Mon Feb 17 12:29:18 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 6B1AEFA7;
 Mon, 17 Feb 2014 12:29:18 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 583CE1AE4;
 Mon, 17 Feb 2014 12:29:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1HCTIiF034583;
 Mon, 17 Feb 2014 12:29:18 GMT (envelope-from jhay@svn.freebsd.org)
Received: (from jhay@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1HCTIrx034582;
 Mon, 17 Feb 2014 12:29:18 GMT (envelope-from jhay@svn.freebsd.org)
Message-Id: <201402171229.s1HCTIrx034582@svn.freebsd.org>
From: John Hay <jhay@FreeBSD.org>
Date: Mon, 17 Feb 2014 12:29:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r262036 - head/release
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Feb 2014 12:29:18 -0000

Author: jhay
Date: Mon Feb 17 12:29:17 2014
New Revision: 262036
URL: http://svnweb.freebsd.org/changeset/base/262036

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

Modified:
  head/release/Makefile

Modified: head/release/Makefile
==============================================================================
--- head/release/Makefile	Mon Feb 17 12:27:02 2014	(r262035)
+++ head/release/Makefile	Mon Feb 17 12:29:17 2014	(r262036)
@@ -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 .