Fixed various nits in the make/release process.
This commit is contained in:
parent
5954c7e303
commit
6e99cc494d
3 changed files with 8 additions and 11 deletions
5
Makefile
5
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) $@
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue