Fixed various nits in the make/release process.

diff --git a/Makefile b/Makefile
index 25c34b66f86f0a2147e0cf1c4cbec2d794a0e692..6e8d118978d04fc7c2a5ed12fe9cc7b0c70516d4 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -33,11 +33,10 @@ libraries:
        cd lib && $(MAKE) install
 
 cmds:
-       @echo "Are the libraries up to date?"; sleep 2
-       test ! -f commands/Makefile || { cd commands && $(MAKE); }
+       cd commands && $(MAKE) all
 
 install::
-       test ! -f commands/Makefile || { cd commands && $(MAKE) $@; }
+       cd commands && $(MAKE) $@
 
 clean::
        cd lib && $(MAKE) $@

diff --git a/tools/chrootmake.sh b/tools/chrootmake.sh
index 22aad1db247c40cc2c24b94fd554b1872edeadbe..f7557efb0dfafa4b9d4a740eac45a3b9f331ffb6 100755 (executable)
--- a/tools/chrootmake.sh
+++ b/tools/chrootmake.sh
@@ -1,12 +1,11 @@
 #!/bin/sh
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
-cd /usr || exit 1
 cd /usr/src || exit 1
 make world install || exit 1
 cd tools || exit 1
+rm revision
 make hdboot || exit 1
 cp ../boot/boot /boot/boot || exit 1
-cd /usr || exit 1
 cd /usr/src || exit 1
 make clean
 exit 0

diff --git a/tools/release.sh b/tools/release.sh
index f822cf74eeaeda27d74365613ce2c2e0eafd9efe..55a172c09bdeebde69ea73f5a595b8aad802b0ad 100755 (executable)
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -5,6 +5,7 @@ RELEASEDIR=/usr/r/release
 IMAGE=cdfdimage
 ROOTIMAGE=rootimage
 ISO=minix.iso
+ISOGZ=minix.iso.gz
 RAM=/dev/ram
 rootmb=16
 rootkb=`expr $rootmb \* 1024`
@@ -39,7 +40,7 @@ mount $RAM $RELEASEDIR || exit
 mkdir -m 755 $RELEASEDIR/usr
 mkdir -m 1777 $RELEASEDIR/tmp
 
-mkfs -B 1024 $TMPDISK || exit
+mkfs $TMPDISK || exit
 echo " * mounting $TMPDISK as $RELEASEDIR/usr"
 mount $TMPDISK $RELEASEDIR/usr || exit
 mkdir -p $RELEASEDIR/tmp
@@ -60,8 +61,6 @@ make programs image
 make image || exit 1
 sh mkboot cdfdboot
 writeisofs -l MINIX -b $IMAGE /tmp $ISO || exit 1
-echo "Appending Minix root filesystem"
-cat >>$ISO $ROOTIMAGE || exit 1
-echo "Appending Minix usr filesystem"
-cat >>$ISO $TMPDISK || exit 1
-ls -al $ISO
+echo "Appending Minix root and usr filesystem"
+cat $ISO $ROOTIMAGE $TMPDISK | gzip >$ISOGZ || exit 1
+ls -al $ISOGZ