Install scripts prettification

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

diff --git a/tools/release.sh b/tools/release.sh
index 70561b4d707f53cb677b01ff1c8772a769ba616a..b66cf1415276b5e4e46b53fa66891e59a3322ccd 100755 (executable)
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-COPYITEMS="usr/src usr/bin bin usr/lib"
+COPYITEMS="usr/bin bin usr/lib"
 RELEASEDIR=/usr/r/release
 IMAGE=cdfdimage
 ROOTIMAGE=rootimage
@@ -9,16 +9,17 @@ ISO=minix.iso
 ISOGZ=minix.iso.gz
 RAM=/dev/ram
 BS=4096
-rootmb=2
-rootkb=`expr $rootmb \* 1024`
-rootbytes=`expr $rootkb \* 1024`
-if [ "`wc -c $RAM | awk '{ print $1 }'`" -ne $rootbytes ]
-then   echo "$RAM should be exactly ${rootkb}k."
-       exit 1
-fi
-echo "Warning: I'm going to mkfs $RAM!"
+USRMB=200
+USRBLOCKS="`expr $USRMB \* 1024 \* 1024 / $BS`"
+ROOTMB=2
+ROOTBLOCKS="`expr $ROOTMB \* 1024 \* 1024 / $BS`"
+echo "Note: this script wants to do cvs operations, so it's necessary"
+echo "to have \$CVSROOT set and cvs login done."
+echo ""
+echo "Warning: I'm going to mkfs $RAM! It has to be at least $ROOTMB MB."
+echo ""
 echo "Temporary (sub)partition to use to make the /usr FS image? "
-echo "It will be mkfsed!"
+echo "I need $USRMB MB. It will be mkfsed!"
 echo -n "Device: /dev/"
 read dev || exit 1
 TMPDISK=/dev/$dev
@@ -38,21 +39,25 @@ echo " * Cleanup old files"
 rm -rf $RELEASEDIR $ISO $IMAGE $ROOTIMAGE $ISOGZ $CDFILES
 mkdir -p $CDFILES || exit
 mkdir -p $RELEASEDIR
-mkfs -B $BS $RAM || exit
-echo " * chowning to bin"
-chown -R bin /usr/src
+echo " * Zeroing $RAM"
+dd if=/dev/zero of=$RAM bs=$BS count=$ROOTBLOCKS
+mkfs -B $BS -b $ROOTBLOCKS $RAM || exit
 echo " * mounting $RAM as $RELEASEDIR"
 mount $RAM $RELEASEDIR || exit
 mkdir -m 755 $RELEASEDIR/usr
 mkdir -m 1777 $RELEASEDIR/tmp
 
-mkfs -B $BS $TMPDISK || exit
-echo " * mounting $TMPDISK as $RELEASEDIR/usr"
+echo " * Zeroing $TMPDISK"
+#dd if=/dev/zero of=$TMPDISK bs=$BS count=$USRBLOCKS
+mkfs -B $BS -b $USRBLOCKS $TMPDISK || exit
+echo " * Mounting $TMPDISK as $RELEASEDIR/usr"
 mount $TMPDISK $RELEASEDIR/usr || exit
 mkdir -p $RELEASEDIR/tmp
 mkdir -p $RELEASEDIR/usr/tmp
 echo " * Transfering $COPYITEMS to $RELEASEDIR"
 ( cd / && tar cf - $COPYITEMS ) | ( cd $RELEASEDIR && tar xf - ) || exit 1
+echo " * Doing new cvs export"
+( cd $RELEASEDIR/usr && mkdir src && cvs export -rHEAD src >/dev/null )
 chown -R bin $RELEASEDIR/usr/src
 # Bug tracking system not for on cd
 rm -rf $RELEASEDIR/usr/src/doc/bugs
@@ -60,16 +65,13 @@ rm -rf $RELEASEDIR/usr/src/doc/bugs
 rm -rf $RELEASEDIR/usr/src/contrib/gnu/coreutils*
 # Make sure the CD knows it's a CD
 date >$RELEASEDIR/CD
-( cd $RELEASEDIR && find . -name CVS | xargs rm -rf )
-#echo " * Making source .tgz for on ISO filesystem"
-#( cd $RELEASEDIR/usr/src && tar cf - . | gzip > $CDFILES/MINIXSRC.TGZ )
 echo " * Chroot build"
 chroot $RELEASEDIR '/bin/sh -x /usr/src/tools/chrootmake.sh' || exit 1
 echo " * Chroot build done"
 cp issue.install $RELEASEDIR/etc/issue
 umount $TMPDISK || exit
 umount $RAM || exit
-cp $RAM $ROOTIMAGE
+dd if=$RAM of=$ROOTIMAGE bs=$BS count=$ROOTBLOCKS
 make programs image
 (cd ../boot && make)
 make image || exit 1
@@ -78,5 +80,5 @@ cp $IMAGE $CDFILES/bootflp.img
 cp release/cd/* $CDFILES
 writeisofs -l MINIX -b $IMAGE $CDFILES $ISO || exit 1
 echo "Appending Minix root and usr filesystem"
-cat $ISO $ROOTIMAGE $TMPDISK | gzip >$ISOGZ || exit 1
+( cat $ISO $ROOTIMAGE ; dd if=$TMPDISK bs=$BS count=$USRBLOCKS ) | gzip -9 >$ISOGZ || exit 1
 ls -al $ISOGZ