From 6e99cc494d5c447004c8827b347bedd699942149 Mon Sep 17 00:00:00 2001 From: Ben Gras Date: Fri, 17 Jun 2005 16:28:36 +0000 Subject: [PATCH] Fixed various nits in the make/release process. --- Makefile | 5 ++--- tools/chrootmake.sh | 3 +-- tools/release.sh | 11 +++++------ 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 25c34b66f..6e8d11897 100755 --- 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 22aad1db2..f7557efb0 100755 --- 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 f822cf74e..55a172c09 100755 --- 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 -- 2.44.0