Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 18 Aug 2011 16:54:04 +0000 (UTC)
From:      Sean Bruno <sbruno@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r224978 - head/release
Message-ID:  <201108181654.p7IGs4SZ065737@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: sbruno
Date: Thu Aug 18 16:54:04 2011
New Revision: 224978
URL: http://svn.freebsd.org/changeset/base/224978

Log:
  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)

Modified:
  head/release/Makefile

Modified: head/release/Makefile
==============================================================================
--- head/release/Makefile	Thu Aug 18 16:45:23 2011	(r224977)
+++ head/release/Makefile	Thu Aug 18 16:54:04 2011	(r224978)
@@ -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}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108181654.p7IGs4SZ065737>