From owner-svn-src-head@FreeBSD.ORG  Fri Dec  4 10:57:02 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 03E7E106566B;
	Fri,  4 Dec 2009 10:57:02 +0000 (UTC) (envelope-from phk@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E6C228FC17;
	Fri,  4 Dec 2009 10:57:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nB4Av1Jq052923;
	Fri, 4 Dec 2009 10:57:01 GMT (envelope-from phk@svn.freebsd.org)
Received: (from phk@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nB4Av1PI052922;
	Fri, 4 Dec 2009 10:57:01 GMT (envelope-from phk@svn.freebsd.org)
Message-Id: <200912041057.nB4Av1PI052922@svn.freebsd.org>
From: Poul-Henning Kamp <phk@FreeBSD.org>
Date: Fri, 4 Dec 2009 10:57:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r200096 - head/tools/tools/sysbuild
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 04 Dec 2009 10:57:02 -0000

Author: phk
Date: Fri Dec  4 10:57:01 2009
New Revision: 200096
URL: http://svn.freebsd.org/changeset/base/200096

Log:
  Add disk-magic for amd64: same as i386.
  
  Pass PORTS_OPTS wherever we invoke ports makefiles
  
  Add a logfile where we can see the progress of distfile prefetching

Modified:
  head/tools/tools/sysbuild/sysbuild.sh

Modified: head/tools/tools/sysbuild/sysbuild.sh
==============================================================================
--- head/tools/tools/sysbuild/sysbuild.sh	Fri Dec  4 09:20:20 2009	(r200095)
+++ head/tools/tools/sysbuild/sysbuild.sh	Fri Dec  4 10:57:01 2009	(r200096)
@@ -43,6 +43,18 @@ if [ `uname -m` = "i386" ] ; then
 
 	# Where our build-bits are to be found
 	FREEBSD_PART=`echo $TARGET_PART | sed 's/s[12]a/s3/'`
+elif [ `uname -m` = "amd64" ] ; then
+	TARGET_PART=`df / | sed '
+	1d
+	s/[    ].*//
+	s,/dev/,,
+	s,s1a,s3a,
+	s,s2a,s1a,
+	s,s3a,s2a,
+	'`
+
+	# Where our build-bits are to be found
+	FREEBSD_PART=`echo $TARGET_PART | sed 's/s[12]a/s3/'`
 else
 	TARGET_PART=unknown
 	FREEBSD_PART=unknown
@@ -162,7 +174,7 @@ ports_recurse() (
 		else
 			(
 			cd $d
-			ports_recurse `make -V _DEPEND_DIRS`
+			ports_recurse `make -V _DEPEND_DIRS ${PORTS_OPTS}`
 			)
 			echo $d >> /tmp/_.plist
 		fi
@@ -195,7 +207,7 @@ ports_build() (
 				cd /usr/ports
 				cd $p
 				set +e
-				make clean
+				make clean ${PORTS_OPTS}
 				if make install ${PORTS_OPTS} ; then
 					if [ "x${PKG_DIR}" != "x" ] ; then
 						make package ${PORTS_OPTS}
@@ -217,9 +229,11 @@ ports_prefetch() (
 	true > /tmp/_.plist
 	ports_recurse $PORTS_WE_WANT
 
+	true > /mnt/_.prefetch
 	# Now checksump/fetch them
 	for p in `cat /tmp/_.plist`
 	do
+		echo "Prefetching $p" >> /mnt/_.prefetch
 		b=`echo $p | tr / _`
 		(
 			cd $p
@@ -434,6 +448,7 @@ if [ "x${OBJ_PATH}" != "x" ] ; then
 fi
 
 log_it Wait for ports prefetch
+log_it "(Tail /mnt/_.prefetch for progress)"
 wait
 
 log_it Move filesystems