summaryrefslogtreecommitdiffstats
path: root/release/Makefile
diff options
context:
space:
mode:
authorjhay <jhay@FreeBSD.org>2014-03-11 12:04:58 +0000
committerjhay <jhay@FreeBSD.org>2014-03-11 12:04:58 +0000
commit817ea2b238a97903c301bbcffe88e08abf548d50 (patch)
tree6fbe21d12a35fec462162c95100e409409f5893a /release/Makefile
parent9b704392219c1bf57c781b0a96fc5a0f0fab1a86 (diff)
downloadFreeBSD-src-817ea2b238a97903c301bbcffe88e08abf548d50.zip
FreeBSD-src-817ea2b238a97903c301bbcffe88e08abf548d50.tar.gz
MFC r262036
etcupdate should use the src tree from where the release is built, not the default (/usr/src) tree.
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 7fc52d1..b3c1191 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