summaryrefslogtreecommitdiffstats
path: root/release/Makefile
diff options
context:
space:
mode:
authorjhay <jhay@FreeBSD.org>2014-02-17 12:29:17 +0000
committerjhay <jhay@FreeBSD.org>2014-02-17 12:29:17 +0000
commitdcf30b256ca3b013729ecdac8aa9eb8ee37cd99e (patch)
tree4dbe4db3c0543f39ac3deae5adb9267c880b2603 /release/Makefile
parentc2818b350b970fb4755511607f5f482fc1d53231 (diff)
downloadFreeBSD-src-dcf30b256ca3b013729ecdac8aa9eb8ee37cd99e.zip
FreeBSD-src-dcf30b256ca3b013729ecdac8aa9eb8ee37cd99e.tar.gz
etcupdate should use the src tree from where the release is built, not
the default (/usr/src) tree. MFC after: 2 weeks
Diffstat (limited to 'release/Makefile')
-rw-r--r--release/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/release/Makefile b/release/Makefile
index c2c46de..13ffaa6 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -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 .
OpenPOWER on IntegriCloud