sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed various nits in the make/release process.

Browse source
This commit is contained in:
Ben Gras 2005-06-17 16:28:36 +00:00
parent 5954c7e303
commit 6e99cc494d
3 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -33,11 +33,10 @@ libraries:
cd lib && $(MAKE) install cd lib && $(MAKE) install
cmds: cmds:
@echo "Are the libraries up to date?"; sleep 2 cd commands && $(MAKE) all
test ! -f commands/Makefile || { cd commands && $(MAKE); }
install:: install::
test ! -f commands/Makefile || { cd commands && $(MAKE) $@; } cd commands && $(MAKE) $@
clean:: clean::
cd lib && $(MAKE) $@ cd lib && $(MAKE) $@

3
tools/chrootmake.sh
View file

@ -1,12 +1,11 @@
#!/bin/sh #!/bin/sh
export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin
cd /usr || exit 1
cd /usr/src || exit 1 cd /usr/src || exit 1
make world install || exit 1 make world install || exit 1
cd tools || exit 1 cd tools || exit 1
rm revision
make hdboot || exit 1 make hdboot || exit 1
cp ../boot/boot /boot/boot || exit 1 cp ../boot/boot /boot/boot || exit 1
cd /usr || exit 1
cd /usr/src || exit 1 cd /usr/src || exit 1
make clean make clean
exit 0 exit 0

11
tools/release.sh
View file

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