diff options
author | sbruno <sbruno@FreeBSD.org> | 2011-08-18 16:54:04 +0000 |
---|---|---|
committer | sbruno <sbruno@FreeBSD.org> | 2011-08-18 16:54:04 +0000 |
commit | 5384a68fd98b9d2c320112b1cc352611abe8a1df (patch) | |
tree | 8a59771dafd7c88569306b5c1df7d88210b6889b /release | |
parent | 6bac2d491ca9c12def1c018c97543e1377c9f1d8 (diff) | |
download | FreeBSD-src-5384a68fd98b9d2c320112b1cc352611abe8a1df.zip FreeBSD-src-5384a68fd98b9d2c320112b1cc352611abe8a1df.tar.gz |
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)
Diffstat (limited to 'release')
-rw-r--r-- | release/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/release/Makefile b/release/Makefile index 0e07ed3..19987cf 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} |