From 0be5f3cf7b396d518b1a808a32bb9505710d6c81 Mon Sep 17 00:00:00 2001
From: Ben Gras <ben@minix3.org>
Date: Thu, 1 Sep 2005 12:30:17 +0000
Subject: [PATCH] reorder drivers for more efficient making

mtree - added /usr/gnu

release - fiddling with deleting unwanted bits before copying for more
efficient packing
---
 drivers/Makefile     |  3 ++-
 etc/mtree/minix.tree |  2 ++
 tools/release.sh     | 24 ++++++++++++++++++------
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/drivers/Makefile b/drivers/Makefile
index 290df9b96..aded41d11 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -34,9 +34,10 @@ all install depend clean:
 
 image:
 	cd ./libdriver && $(MAKE) build
+	cd ./libpci && $(MAKE) build
+	cd ./tty && $(MAKE) build
 	cd ./memory && $(MAKE) build
 	cd ./at_wini && $(MAKE) build
 	cd ./floppy && $(MAKE) build
 	cd ./bios_wini && $(MAKE) build
 	cd ./log && $(MAKE) build
-	cd ./tty && $(MAKE) build
diff --git a/etc/mtree/minix.tree b/etc/mtree/minix.tree
index ae1abbf72..249a01cd8 100644
--- a/etc/mtree/minix.tree
+++ b/etc/mtree/minix.tree
@@ -15,6 +15,8 @@
 755 root    operator /usr/adm/old
 755 ast     other    /usr/ast
 755 bin     operator /usr/bin
+755 bin     operator /usr/gnu
+755 bin     operator /usr/gnu/bin
 755 root    operator /usr/etc
 755 root    operator /home
 755 root    operator /usr/home
diff --git a/tools/release.sh b/tools/release.sh
index 376c62ad5..2e96a4bc2 100755
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -66,8 +66,9 @@ ROOTBLOCKS="`expr $ROOTMB \* 1024 \* 1024 / $BS`"
 
 HDEMU=0
 COPY=0
+ALL=0
 
-while getopts "ch?" c
+while getopts "cha?" c
 do
 	case "$c" in
 	\?)
@@ -80,6 +81,9 @@ do
 	c)
 		COPY=1
 		;;
+	a)
+		ALL=1
+		;;
 	esac
 done
 
@@ -147,20 +151,28 @@ echo " * Transfering $COPYITEMS to $RELEASEDIR"
 if [ "$COPY" -ne 1 ]
 then
 	echo " * Doing new cvs export"
-	( cd $RELEASEDIR/usr && mkdir src && cvs export -rHEAD src >/dev/null || exit 1 )
+	rm -rf src
+	cvs export -rHEAD src >/dev/null || exit 1
+	srcdir=src
+	if [ "$ALL" = 0 ]
+	then
+		# No contrib stuff
+		rm -rf src/contrib
+	fi
 else
 	( cd .. && make clean )
-	echo " * Transfering source to $RELEASEDIR"
-	( cd /usr && tar cf - src ) | ( cd $RELEASEDIR/usr && tar xf - )
+	srcdir=/usr/src
 fi
 
+echo " * Transfering source to $RELEASEDIR"
+
+( cd $srcdir && tar cf - . ) | ( cd $RELEASEDIR/usr && mkdir src && cd src && tar xf - )
+
 chown -R bin $RELEASEDIR/usr/src
 find $RELEASEDIR/usr/src -type d | xargs chmod 755
 find $RELEASEDIR/usr/src -type f | xargs chmod 644
 # Bug tracking system not for on cd
 rm -rf $RELEASEDIR/usr/src/doc/bugs
-# No GNU core utils
-rm -rf $RELEASEDIR/usr/src/contrib/gnu/coreutils*
 # Make sure the CD knows it's a CD
 date >$RELEASEDIR/CD
 echo " * Chroot build"