This commit was manufactured by cvs2svn to create branch

'unlabeled-1.1.1'.

1 files changed, 33 insertions, 34 deletions

diff --git a/update_kernel b/update_kernel
index a644e99a1..9e483cd14 100755
--- a/update_kernel
+++ b/update_kernel
@@ -1,52 +1,51 @@
 #!/bin/bash
 
-KERNEL_BOOT_PATH="kernel"
+KERNEL_VERSION="*BOOT"
+KERNEL_VERSION="2.2.11-BOOT"
 
-function f() { 
-    v=`perl -Iperl-install -Mmodules -e "print qq(\\$_.o\n) foreach modules::module_of_type__4update_kernel(\"$1\")"` 
-}
+SCSI_DRIVERS="
+     53c7,8xx.o AM53C974.o BusLogic.o NCR53c406a.o advansys.o aha152x.o
+     aha1542.o aha1740.o aic7xxx.o dtc.o eata_dma.o eata_pio.o fdomain.o
+     g_NCR5380.o in2000.o megaraid.o ncr53c8xx.o pas16.o
+     qlogicisp.o seagate.o t128.o u14-34f.o wd7000.o ultrastor.o"
 
-ARCH=`uname -m | sed -e 's/i.86/i386/' -e 's/sparc.*/sparc/'`
+# broken network modules: at1700.o
+NETWORK_DRIVERS="
+     3c501.o 3c503.o 3c505.o 3c507.o 3c509.o 3c59x.o 82596.o 8390.o ac3200.o
+     epic100.o cs89x0.o de4x5.o de600.o de620.o dgrs.o e2100.o
+     eepro.o eepro100.o eexpress.o es3210.o eth16i.o hp-plus.o hp.o
+     hp100.o ibmtr.o lance.o lne390.o ne.o ne2k-pci.o ne3210.o ni52.o
+     ni5010.o ni65.o plip.o
+     pcnet32.o rtl8139.o rcpci45.o sktr.o smc9194.o smc-ultra.o
+     smc-ultra32.o tlan.o 
+     tulip.o via-rhine.o wavelan.o wd.o yellowfin.o
 
-f "scsi|disk" ; SCSI_DRIVERS=$v
-f "net|network" ; NETWORK_DRIVERS=$v
-f "scsi|cdrom" ; CD_DRIVERS=$v
-f "pcmcia|network" ; PCMCIA_DRIVERS=$v
+     nfs.o lockd.o sunrpc.o"
 
-[ $ARCH == "i386" ] && FSMODULES="vfat.o fat.o"
+CD_DRIVERS="aztcd.o cm206.o isp16.o mcdx.o sbpcd.o sonycd535.o cdu31a.o gscd.o mcd.o optcd.o sjcd.o"
 
-NETWORK_MODULES="$FSMODULES $NETWORK_DRIVERS"
-CDROM_MODULES="  $FSMODULES $CD_DRIVERS"
-HD_MODULES="     $FSMODULES $SCSI_DRIVERS"
-PCMCIA_MODULES=" $FSMODULES $PCMCIA_DRIVERS af_packet.o isofs.o scsi_mod.o sr_mod.o sd_mod.o cdrom.o ide-cd.o ide-mod.o ide-probe.o ide-disk.o serial.o"
-NOT_USEFULL_IN_STAGE1="nls_*.o parport_probe.o raid*.o serial.o smbfs.o usb-*.o"
+BLOCK_DRIVERS="DAC960.o cpqarray.o"
 
-PCMCIA_INSTALLMODULES="pcmcia_core.o tcic.o ds.o i82365.o"
+PCMCIAMODULES="pcmcia_core.o tcic.o ds.o i82365.o"
 
-if [ "$ARCH" == "i386" ]; then
-    #disable any existing resolution!!!
-    cp -f $KERNEL_BOOT_PATH/boot/vmlinuz* vmlinuz
-    /usr/sbin/rdev -v vmlinuz 65535 #788 #785 
+MISCMODULES="lp.o parport_pc.o parport.o loop.o"
 
-    rm -rf install_pcmcia_modules ; install -d install_pcmcia_modules
-else
-    cp -f "$KERNEL_BOOT_PATH"/boot/vmlinux.gz .
-fi
-cp -f $KERNEL_BOOT_PATH/boot/System.map* System.map
+FSMODULES="vfat.o fat.o"
 
+NETWORK_MODULES="$MISCMODULES $FSMODULES $NETWORK_DRIVERS"
+CDROM_MODULES="  $MISCMODULES $FSMODULES $SCSI_DRIVERS $CD_DRIVERS"
+HD_MODULES="     $MISCMODULES $FSMODULES $SCSI_DRIVERS $BLOCK_DRIVERS"
+
+
+cp -f /boot/vmlinuz-$KERNEL_VERSION vmlinuz
 rm -rf modules ; install -d modules
+
 (cd modules ; 
-    cp -f `find ../"$KERNEL_BOOT_PATH"/lib/modules/ -name "*.o"` .
-    /sbin/depmod -m ../System.map -i -e *.o | perl -pe 's/\\\n//' | perl -ne 's/\.o//g; s/[ \t]+/ /g; print if /: /' > modules.dep
-    perl -pi -e 's/((plip|ppa|imm): parport)/$1 parport_pc/' modules.dep
-    ls *.o              | build_archive modules.cz 400000
+    cp -f `find /lib/modules/$KERNEL_VERSION -name "*.o"` .
+    /sbin/depmod -m /boot/System.map-$KERNEL_VERSION -i -e *.o | grep ': ' | sed 's/\.o//g' > modules.dep
     ls *.o              | cpio --quiet -H crc -o | bzip2 -9> modules.cpio.bz2
     ls $NETWORK_MODULES | cpio --quiet -H crc -o | gzip -9 > network_modules.cgz
     ls $CDROM_MODULES   | cpio --quiet -H crc -o | gzip -9 > cdrom_modules.cgz	
     ls $HD_MODULES      | cpio --quiet -H crc -o | gzip -9 > hd_modules.cgz     
-    ls $PCMCIA_MODULES  | cpio --quiet -H crc -o | gzip -9 > pcmcia_modules.cgz
-[ "$ARCH" == "i386" ] && {
-    cp $PCMCIA_INSTALLMODULES ../install_pcmcia_modules/
-}
-    rm -f $NETWORK_MODULES $CDROM_MODULES $HD_MODULES $PCMCIA_MODULES $PCMCIA_INSTALLMODULES $NOT_USEFULL_IN_STAGE1 # leave in the directory non-install1 used modules
+    rm -f $NETWORK_MODULES $CDROM_MODULES $HD_MODULES # leave in the directory non-install1 used modules
 )