aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Bruno <sbruno@FreeBSD.org>2011-08-18 16:54:04 +0000
committerSean Bruno <sbruno@FreeBSD.org>2011-08-18 16:54:04 +0000
commit672d7ddbcc406da93d22b0e74ee5d70659bd69ef (patch)
tree8a59771dafd7c88569306b5c1df7d88210b6889b
parent5f06dfb7923cbded10f8b82207a84b5f24b0a7a6 (diff)
downloadsrc-672d7ddbcc406da93d22b0e74ee5d70659bd69ef.tar.gz
src-672d7ddbcc406da93d22b0e74ee5d70659bd69ef.zip
Allow release generation from a WORLDDIR that is not /usr/src
PR: misc/159666 Submitted by: Test Rat <ttsestt@gmail.com> Reviewed by: Nathan Whitehorn <nwhitehorn@freebsd.org> Approved by: re (kib)
Notes
Notes: svn path=/head/; revision=224978
-rw-r--r--release/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/release/Makefile b/release/Makefile
index 0e07ed3a45b7..19987cf76404 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -66,7 +66,7 @@ base.txz:
-mkdir ${DISTDIR}
cd ${WORLDDIR} && ${IMAKE} distributeworld DISTDIR=${DISTDIR}
# Set up mergemaster root database
- sh ${.CURDIR}/scripts/mm-mtree.sh -F \
+ sh ${.CURDIR}/scripts/mm-mtree.sh -m ${WORLDDIR} -F \
"TARGET_ARCH=${TARGET_ARCH} TARGET=${TARGET}" -D "${DISTDIR}/base"
# Package all components
cd ${WORLDDIR} && ${IMAKE} packageworld DISTDIR=${DISTDIR}