aboutsummaryrefslogtreecommitdiff
path: root/release
diff options
context:
space:
mode:
authorJohn Hay <jhay@FreeBSD.org>2014-02-17 12:29:17 +0000
committerJohn Hay <jhay@FreeBSD.org>2014-02-17 12:29:17 +0000
commitd6d73d476bee77cd1d2ef815ca51efc2f0689911 (patch)
tree4dbe4db3c0543f39ac3deae5adb9267c880b2603 /release
parent044ae9dbefd474884a279caf4cb6795b52c0d981 (diff)
downloadsrc-d6d73d476bee77cd1d2ef815ca51efc2f0689911.tar.gz
src-d6d73d476bee77cd1d2ef815ca51efc2f0689911.zip
etcupdate should use the src tree from where the release is built, not
the default (/usr/src) tree. MFC after: 2 weeks
Notes
Notes: svn path=/head/; revision=262036
Diffstat (limited to 'release')
-rw-r--r--release/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/release/Makefile b/release/Makefile
index c2c46de1f4e1..13ffaa606492 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 .