svn commit: r262036 - head/release
John Hay
jhay at FreeBSD.org
Mon Feb 17 12:29:18 UTC 2014
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 .
More information about the svn-src-all
mailing list