More polishing to the boot and release process. Highlights:

. Less dependency on scripts to be executable (they're in cvs)
	. issue.install is the /etc/issue that goes on an install CD
	  for instructions (but not on the installed system)
	. /usr/src goes on the CD uncompressed
This commit is contained in:
Ben Gras 2005-05-03 15:37:34 +00:00
parent 0e9261ed5a
commit 5415e8280f
5 changed files with 11 additions and 6 deletions

View file

@ -8,7 +8,7 @@ MAKE= exec make -$(MAKEFLAGS)
# specify the programs that are part of the system image # specify the programs that are part of the system image
PROGRAMS= ../kernel/kernel \ PROGRAMS= ../kernel/kernel \
../servers/mm/mm \ ../servers/pm/pm \
../servers/fs/fs \ ../servers/fs/fs \
../servers/is/is \ ../servers/is/is \
../drivers/tty/tty \ ../drivers/tty/tty \

View file

@ -1,13 +1,13 @@
#!/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 || exit 1
tar cf - src | compress >src.tar.z || 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
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 || exit 1
rm -rf /usr/src || exit 1 cd /usr/src || exit 1
make clean
exit 0 exit 0

3
tools/issue.install Normal file
View file

@ -0,0 +1,3 @@
Login as root and run 'setup' to install Minix.

View file

@ -61,7 +61,7 @@ hdboot)
"exec mv $rootdir/M $rootdir/boot/image/`uname -r`.`uname -v`" "exec mv $rootdir/M $rootdir/boot/image/`uname -r`.`uname -v`"
fi fi
./tell_config OS_RELEASE . OS_VERSION >/tmp/mkb.$$ sh tell_config OS_RELEASE . OS_VERSION >/tmp/mkb.$$
version=`sed 's/[" ]//g;/^$/d' </tmp/mkb.$$` version=`sed 's/[" ]//g;/^$/d' </tmp/mkb.$$`
revision=`cat revision 2>/dev/null` revision=`cat revision 2>/dev/null`
@ -160,7 +160,7 @@ cdfdboot)
cp -p ../boot/boot /mnt/boot/boot || exit 1 cp -p ../boot/boot /mnt/boot/boot || exit 1
umount $dev || exit 1 umount $dev || exit 1
installboot -d $dev ../boot/bootblock boot/boot || exit 1 installboot -d $dev ../boot/bootblock boot/boot || exit 1
edparams $dev 'unset bootopts; unset servers; unset image; ramimagedev=c0d2p1; unset rootdev; unset leader; leader() { echo If the system cannot find root, please hit ESC and set your\nramimagedev to the CD device, partition 1. e.g.\nramimagedev=c0d2p1 .. then boot to start.\n }; bootcd=1; main(){delay 10000;boot}; save' || exit edparams $dev 'unset bootopts; unset servers; unset image; ramimagedev=c0d2p1; unset rootdev; unset leader; leader() { echo If the system cannot find root, please hit ESC and set your\nramimagedev to the CD device, partition 1. e.g.\nramimagedev=c0d2p1 .. then boot to start.\n\nOtherwise I will boot with my defaults in 10 seconds.\n\n }; bootcd=1; main(){delay 10000;boot}; save' || exit
# copy image # copy image
dd if=$dev of=cdfdimage bs=8192 count=180 dd if=$dev of=cdfdimage bs=8192 count=180

View file

@ -55,10 +55,12 @@ mkdir -p $RELEASEDIR/tmp
mkdir -p $RELEASEDIR/usr/tmp mkdir -p $RELEASEDIR/usr/tmp
echo " * Transfering $COPYITEMS to $RELEASEDIR" echo " * Transfering $COPYITEMS to $RELEASEDIR"
( cd / && tar cf - $COPYITEMS ) | ( cd $RELEASEDIR && tar xf - ) || exit 1 ( cd / && tar cf - $COPYITEMS ) | ( cd $RELEASEDIR && tar xf - ) || exit 1
date >$RELEASEDIR/CD
( cd $RELEASEDIR && find . -name CVS | xargs rm -rf ) ( cd $RELEASEDIR && find . -name CVS | xargs rm -rf )
echo " * Chroot build" echo " * Chroot build"
chroot $RELEASEDIR '/bin/sh -x /usr/src/tools/chrootmake.sh' || exit 1 chroot $RELEASEDIR '/bin/sh -x /usr/src/tools/chrootmake.sh' || exit 1
echo " * Chroot build done" echo " * Chroot build done"
cp issue.install $RELEASEDIR/etc/issue
umount $TMPDISK || exit umount $TMPDISK || exit
umount $TMPTMPDISK || exit umount $TMPTMPDISK || exit
umount $RAM || exit umount $RAM || exit
@ -66,7 +68,7 @@ cp $RAM $ROOTIMAGE
make programs image make programs image
(cd ../boot && make) (cd ../boot && make)
make image || exit 1 make image || exit 1
./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 filesystem"
cat >>$ISO $ROOTIMAGE || exit 1 cat >>$ISO $ROOTIMAGE || exit 1