From 9dfbfc9af73ca6903974b9f687c25c3a6a0d445d Mon Sep 17 00:00:00 2001 From: Ben Gras Date: Wed, 25 Sep 2013 12:22:27 +0000 Subject: [PATCH] release.sh: simplify by removing usb option . relies on bios_wini which is long gone Change-Id: I95257b6204cc6d928abcbd8492808b4b6450a99e --- etc/system.conf | 3 -- man/man8/config.8 | 21 --------- releasetools/release.functions | 15 ------- releasetools/release.sh | 81 +++++++++++----------------------- 4 files changed, 26 insertions(+), 94 deletions(-) diff --git a/etc/system.conf b/etc/system.conf index 48796b607..dc81ce5ce 100644 --- a/etc/system.conf +++ b/etc/system.conf @@ -524,11 +524,9 @@ service filter ipc SYSTEM pm vfs rs ds vm at_wini - bios_wini ; control at_wini - bios_wini ; }; @@ -684,6 +682,5 @@ service fbd SYSTEM VFS RS DS VM ahci at_wini - bios_wini ; }; diff --git a/man/man8/config.8 b/man/man8/config.8 index bec77ddbe..87948107c 100644 --- a/man/man8/config.8 +++ b/man/man8/config.8 @@ -240,27 +240,6 @@ programs do with mail boxes. A "no locks available" error indicates that this table has run out. .PP .ti 2m -.B kernel/bios_wini.c -.ti 2m -.B kernel/dosfile.c -.ti 2m -.B kernel/fatfile.c -.br -The number of disks each of these drivers can handle is specified by: -.TP -.B MAX_DRIVES -This parameter is set to -.B 4 -for the BIOS and "DOS file" drivers, and to -.B 2 -for the "FAT file" driver. It can be set as high as you need to allow for -more disks, or files as disks. (The "FAT" driver needs quite some memory per -disk, which is why it by default only allows 2 disks.) You will need to run -.BR MAKEDEV (8) -to create the extra disk devices in -.BR /dev/ . -.PP -.ti 2m .B inet/inet_config.h .br The maximum number of TCP/IP networks is: diff --git a/releasetools/release.functions b/releasetools/release.functions index 49b5d0299..7c56407ef 100644 --- a/releasetools/release.functions +++ b/releasetools/release.functions @@ -100,21 +100,6 @@ load=/mod12_init END_BOOT_CFG } -usb_root_changes() -{ - $RELEASEDIR/usr/sbin/installboot_nbsd $TMPDISKROOT \ - $RELEASEDIR/usr/mdec/bootxx_minixfs3 - echo \ -cat >$RELEASEMNTDIR/boot.cfg <] [-s ] -j [-L ] [-e ]" >&2 + echo "Usage: $0 [-l] [-p] [-c] [-m] [-M] [-f ] [-s ] -j [-L ] [-e ]" >&2 exit 1 ;; b) @@ -96,11 +96,6 @@ do RELEASEDIR=$OPTARG JAILMODE=1 ;; - u) - echo " * Making live USB-stick image" - IMG_BASE=minix${version}_usb - USB=1 - ;; f) FILENAMEOUT="$OPTARG" ;; @@ -193,11 +188,7 @@ then #endif" >>$CONFIGHEADER DATE=`date +%Y%m%d` # output image name - if [ "$USB" -ne 0 ]; then - IMG=${IMG_BASE}_${DATE}_${REVTAG}.img - else - IMG=${IMG_BASE}_${DATE}_${REVTAG}.iso - fi + IMG=${IMG_BASE}_${DATE}_${REVTAG}.iso else echo "First cleaning current sourcedir.." ( cd .. && make cleandir >/dev/null ) @@ -211,9 +202,7 @@ else fi # Make sure the CD knows it's a CD, unless it's not -if [ "$USB" -eq 0 ] -then date >$RELEASEDIR/CD -fi +date >$RELEASEDIR/CD rm -f $RELEASEDIR/usr/$SRC/releasetools/revision @@ -293,17 +282,6 @@ extrakb=`du -ks $RELEASEDIR/usr/install | awk '{ print $1 }'` find $RELEASEDIR/usr | fgrep -v /install/ | wc -l >$RELEASEDIR/.usrfiles find $RELEASEDIR -print -path $RELEASEDIR/usr -prune | wc -l >$RELEASEDIR/.rootfiles -fstab_marker="# Poor man's File System Table." -echo " * Writing fstab" -if [ "$USB" -ne 0 ] -then - echo \ -"$fstab_marker -root=/dev/c0d7p0s0 -usr=/dev/c0d7p0s2 -" > $RELEASEDIR/etc/fstab -fi - ########################################################################## echo " * Mounting $TMPDISKROOT as $RELEASEMNTDIR" ########################################################################## @@ -329,10 +307,7 @@ echo " * Unmounting $TMPDISKUSR from $RELEASEMNTDIR/usr" umount $TMPDISKUSR || exit echo " * Making image bootable" -if [ "$USB" -ne 0 ] -then usb_root_changes -else cd_root_changes -fi +cd_root_changes echo " * Unmounting $TMPDISKROOT from $RELEASEMNTDIR" umount $TMPDISKROOT || exit @@ -348,31 +323,27 @@ echo "This is Minix version $version_pretty prepared `date`." >$CDFILES/VERSION. boottype=-n bootimage=$IMAGE -if [ "$USB" -ne 0 ]; then - mv $bootimage $IMG -else - cp $RELEASEDIR/usr/mdec/boot_monitor $CDFILES/boot - cp -rf $RELEASEDIR/boot/minix_latest/* $CDFILES/ - gzip -d $CDFILES/*gz - writeisofs -s0x0 -l MINIX -B $bootimage $boottype $CDFILES $IMG || exit 1 - - echo "Appending Minix root and usr filesystem" - # Pad ISO out to cylinder boundary - isobytes=`stat -f %z $IMG` - isosects=`expr $isobytes / 512` - isopad=`expr $secs - '(' $isosects % $secs ')'` - dd if=/dev/zero count=$isopad >>$IMG - # number of sectors - isosects=`expr $isosects + $isopad` - ( cat $IMG $ROOTIMAGE ; - dd if=$TMPDISKUSR bs=$BS count=$USRBLOCKS ) >m - mv m $IMG - # Make CD partition table - installboot_nbsd -m $IMG /usr/mdec/mbr - # Make sure there is no hole..! Otherwise the ISO format is - # unreadable. - partition -m $IMG 0 81:$isosects 81:$ROOTSECTS 81:$USRSECTS -fi +cp $RELEASEDIR/usr/mdec/boot_monitor $CDFILES/boot +cp -rf $RELEASEDIR/boot/minix_latest/* $CDFILES/ +gzip -d $CDFILES/*gz +writeisofs -s0x0 -l MINIX -B $bootimage $boottype $CDFILES $IMG || exit 1 + +echo "Appending Minix root and usr filesystem" +# Pad ISO out to cylinder boundary +isobytes=`stat -f %z $IMG` +isosects=`expr $isobytes / 512` +isopad=`expr $secs - '(' $isosects % $secs ')'` +dd if=/dev/zero count=$isopad >>$IMG +# number of sectors +isosects=`expr $isosects + $isopad` +( cat $IMG $ROOTIMAGE ; + dd if=$TMPDISKUSR bs=$BS count=$USRBLOCKS ) >m +mv m $IMG +# Make CD partition table +installboot_nbsd -m $IMG /usr/mdec/mbr +# Make sure there is no hole..! Otherwise the ISO format is +# unreadable. +partition -m $IMG 0 81:$isosects 81:$ROOTSECTS 81:$USRSECTS # Clean up: RELEASEDIR no longer needed rm -r $RELEASEDIR -- 2.44.0