SVN: bootdisk/trunk/mkimages

[hawk]

Author: hawk
Date: Thu Apr  5 00:04:54 2007
New Revision: 8429

Modified:
   bootdisk/trunk/mkimages
Log:
- create squashfs initrd by default
- removed tg3.o from net bootdisk (not enough space)
- ext2 support is now modularized, include it in bootdisks
- cleanup


Modified: bootdisk/trunk/mkimages
==============================================================================
--- bootdisk/trunk/mkimages	(original)
+++ bootdisk/trunk/mkimages	Thu Apr  5 00:04:54 2007
@@ -95,51 +95,30 @@
 
 network_conf
 
-if [ "$KERNEL_VERCODE" -gt 2 ] ; then
-  # we don't need much additional space on 2.4 bootdisk, tmpfs is used
-  # for / anyway
-  kernel_opt="-A 100 -m ext2 -R"
-else
-  kernel_opt=""
-fi
+kernel_opt="-A 100 -m ext2 -Q"
 
 eth_addons=
 mii=
 nfs=,nfs
-if [ $KERNEL_VERCODE -gt 2 ] ; then
-  mii=mii.o
-  nfs=
-fi
+mii=mii.o
+nfs=
 for f in $mii 3c59x.o e100.o 8139too.o 8390.o \
 	   ne2k-pci.o pcnet32.o ; do
   eth_addons="$eth_addons,eth/$f"
 done
-for f in e1000.o tg3.o r8169.o ; do
+for f in e1000.o r8169.o ; do
   eth_addons="$eth_addons,eth-gbit/$f"
 done
-mkimage net -p ui,net,lists -m $eth_addons -m af_packet$nfs
-
-short_cut=no
-
-if [ "$short_cut" = yes ] ; then
-#  targetdir=/adm/ftp/dists/ra/PLD/i586/$INSTALLER_DIR
-#  mkdir -p $targetdir
-#  cp tarbz2/*.tar.bz2 $targetdir
-  exit 0
-fi
+mkimage net -p ui,net,lists -m $eth_addons -m ext2,af_packet$nfs
 
 # supports PCMCIA network cards
 network_conf
-mkimage pcmcia -p ui,lists,pcmcia,net
+mkimage pcmcia -p ui,lists,pcmcia,net -m ext2
 
 # supports ide, scsi, and old cdroms
 cdrom_conf
-if [ "$KERNEL_VERCODE" -gt 2 ] ; then
-    mkimage cd -p ui,lists -m ide,cdrom,scsi
-else
-    mkimage cd -p ui,lists -m ide,cdrom,old-cdrom,scsi
-fi
+mkimage cd -p ui,lists -m ext2,ide,cdrom,scsi
 
 # image for official ISO
 cdrom_conf
-mkimage iso -D -S 4096 -p ui,lists -m cdrom,ide,ide-low,scsi,scsi-low,usb
+mkimage iso -D -S 4096 -p ui,lists -m ext2,cdrom,ide,ide-low,scsi,scsi-low,usb