From: Ben Gras <ben@minix3.org>
Date: Mon, 28 Jul 2014 11:32:51 +0000 (+0200)
Subject: release script fixes
X-Git-Tag: v3.3.0~96
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/static/doc/zpipe.c?a=commitdiff_plain;h=597efc6c547383460b01721202c967b41a2ad04c;p=minix.git

release script fixes

	. we need libc++ in the base system
	. big packages & sources don't fit on the cd any more
	. the fetch scripts have to be triggered for some tools

Change-Id: Ife53c64fda0ed65b96fa8d6a0b0fee2c6a14d6d7
---

diff --git a/releasetools/release.sh b/releasetools/release.sh
index 80b2b78c8..e394e7f25 100755
--- a/releasetools/release.sh
+++ b/releasetools/release.sh
@@ -31,11 +31,7 @@ PACKAGEURL=ftp://ftp.minix3.org/pub/minix/packages/$version_pretty/`uname -m`/Al
 PREINSTALLED_PACKAGES="
 	pkg_install
 	pkgin
-	bmake
-	binutils
-	clang
 	"
-#	pkg_tarup
 
 PKG_ADD_URL=$PACKAGEURL
 
@@ -170,6 +166,9 @@ then
 	echo "Retrieving latest minix repo from $REPO branch $GITBRANCH."
 	srcdir=$RELEASEDIR/usr/src
 	git clone -b $GITBRANCH $REPO $srcdir
+	echo "Triggering fetch scripts"
+	( cd $srcdir && sh ./gnu/dist/fetch.sh )
+	( cd $srcdir && sh ./external/gpl3/binutils/fetch.sh )
 	if [ "$REVTAG" ]
 	then	echo "Doing checkout of $REVTAG."
 		(cd $srcdir && git checkout $REVTAG )
@@ -220,7 +219,7 @@ echo " * Build"
 ##########################################################################
 
 cd $RELEASEDIR/usr/src
-make distribution DESTDIR=$RELEASEDIR SLOPPY_FLIST=yes $BUILDOPTIONS
+make build MKLIBCXX=yes DESTDIR=$RELEASEDIR SLOPPY_FLIST=yes $BUILDOPTIONS
 make -C releasetools do-hdboot DESTDIR=$RELEASEDIR MKINSTALLBOOT=yes
 cp $RELEASEDIR/usr/mdec/boot_monitor $RELEASEDIR
 cp $RELEASEDIR/boot/minix_latest/* $RELEASEDIR/boot/minix_default/
@@ -264,6 +263,10 @@ if [ $EXTRAS_INSTALL -ne 0 ] ; then
     cp -Rv $EXTRAS_PATH/* $RELEASEDIR
 fi
 
+echo " * Removing sources"
+
+rm -rf $RELEASEDIR/usr/src # No space for /usr/src
+
 # If we are making a jail, all is done!
 if [ $JAILMODE = 1 ]
 then	echo "Created new minix install in $RELEASEDIR."