svn commit: r263015 - stable/10/release
John Hay
jhay at FreeBSD.org
Tue Mar 11 12:04:59 UTC 2014
Author: jhay
Date: Tue Mar 11 12:04:58 2014
New Revision: 263015
URL: http://svnweb.freebsd.org/changeset/base/263015
Log:
MFC r262036
etcupdate should use the src tree from where the release is built, not
the default (/usr/src) tree.
Modified:
stable/10/release/Makefile
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/release/Makefile
==============================================================================
--- stable/10/release/Makefile Tue Mar 11 10:27:57 2014 (r263014)
+++ stable/10/release/Makefile Tue Mar 11 12:04:58 2014 (r263015)
@@ -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 .
More information about the svn-src-all
mailing list