From 04af01cefa358520ab4c9b608e1e47f8f1e664f2 Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Tue, 21 Sep 1999 15:32:51 +0000 Subject: *** empty log message *** --- Makefile | 5 +++-- make_boot_img | 19 +++++++++++-------- update_kernel | 49 ++++++++++++++++++++++++++++++++++++------------- 3 files changed, 50 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index 0dda119f0..c3d155efa 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -BOOT_IMG = gi_hd.img gi_cdrom.img gi_network.img gi_network_ks.img +BOOT_IMG = gi_hd.img gi_cdrom.img gi_network.img gi_network_ks.img gi_pcmcia.img BINS = install/install install/local-install install/installinit/init @@ -14,6 +14,7 @@ clean: $(BOOT_IMG): $(BINS) if [ ! -e modules ]; then $(MAKE) update_kernel; fi + #./make_boot_img $@ $(@:gi_%.img=%) ./make_boot_img $@ $(@:gi_%.img=%) $(BINS): @@ -27,4 +28,4 @@ $(BOOT_IMG:%=%f): %f: % dd if=$< of=/dev/fd0 xmessage "Floppy done" -# mkisofs -R -b images/gi_cdrom.img -c images/.catalog /tmp/r /mnt/disk/ | cdrecord -v -eject speed=6 dev=1,0 - \ No newline at end of file +# mkisofs -R -b images/gi_cdrom.img -c images/.catalog /tmp/r /mnt/disk/ | cdrecord -v -eject speed=6 dev=1,0 - diff --git a/make_boot_img b/make_boot_img index 6ba6d0d2a..acfb27093 100755 --- a/make_boot_img +++ b/make_boot_img @@ -1,9 +1,10 @@ #!/usr/bin/perl -@ARGV >= 2 or die "usage: $0 cdrom|hd|network|network_ks\n"; +@ARGV >= 2 or die "usage: $0 cdrom|hd|network|network_ks|pcmcia\n"; ($img, $type) = @ARGV; +$instdir = "install"; $ks = "kickstart=floppy" if $type =~ s/_ks//; $mnt = "/mnt/disk"; if ($>) { @@ -13,6 +14,7 @@ if ($>) { $install = $ {{ + pcmcia => "install", network => "install", cdrom => "local-install", hd => "local-install" @@ -29,15 +31,16 @@ sub _ { __ @_; $? and die; } sub initrd { my ($mnt, $img) = @_; my $tmp = "$ENV{HOME}/tmp/initrd"; + my $inst1 = -d "$instdir/install1_$type" ? "install1_$type" : "install1"; - _ "install -s install/installinit/init install/install1/sbin/init"; - _ "install -s install/$install install/install1/sbin/install"; + _ "install -s $instdir/installinit/init $instdir/$inst1/sbin/init"; + _ "install -s $instdir/$install $instdir/$inst1/sbin/install"; __ "$sudo umount $tmp $mnt 2>/dev/null"; _ "dd if=/dev/zero of=$tmp bs=1k count=2000"; _ "echo y | mke2fs $tmp"; _ "$sudo mount $tmp $mnt -o loop"; - _ "$sudo cp -a install/install1/* $mnt"; + _ "$sudo cp -a $instdir/$inst1/* $mnt"; _ "$sudo install -d $mnt/modules"; _ "$sudo cp -f modules/${type}_modules.cgz $mnt/modules/modules.cgz"; _ "$sudo cp -f modules/modules.dep $mnt/modules/"; @@ -50,19 +53,19 @@ sub boot_img { my ($mnt, $img) = @_; __ "$sudo umount $mnt 2>/dev/null"; - _ "bunzip2 -c install/installinit/emptyboot.img.bz2 > $img"; + _ "bunzip2 -c $instdir/installinit/emptyboot.img.bz2 > $img"; _ "$sudo mount -o umask=0 $img $mnt -o loop"; _ "cat vmlinuz > $mnt/vmlinuz"; - initrd("${mnt}2", "$mnt/initrd.gz"); + initrd("${mnt}2", "$mnt/$type.rdz"); output("$mnt/syslinux.cfg", " default linux prompt 0 label linux kernel vmlinuz - append $ks ramdisk=32000 initrd=initrd.gz mdkinst $type + append $ks ramdisk=32000 initrd=$type.rdz mdkinst $type "); - _ "cp -f install/installinit/ks.cfg $mnt 2>/dev/null" if $ks; + _ "cp -f $instdir/installinit/ks.cfg $mnt 2>/dev/null" if $ks; _ "sync"; } diff --git a/update_kernel b/update_kernel index 3bc23f36e..714580214 100755 --- a/update_kernel +++ b/update_kernel @@ -1,27 +1,45 @@ #!/bin/bash -KERNEL_VERSION="*BOOT" -KERNEL_VERSION="2.2.13BOOTchmou5" +KERNEL_BOOT_PATH="kernel-2.2.13BOOTchou5" 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 initio.o megaraid.o ncr53c8xx.o pas16.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" # 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 e2100.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 + hp100.o ibmtr.o initio.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 + nfs.o lockd.o sunrpc.o + 3c589_cs.o" +# 3c589_cs.o ibmtr_cs.o nmclan_cs.o pcnet_cs.o smc91c92_cs.o wavelan_cs.o +# fmvj18x_cs.o netwave_cs.o xirc2ps_cs.o 3c574_cs.o" + +PCMCIA_DRIVERS=" + 3c574_cs.o 3c575_cb.o 3c589_cs.o aha152x_cs.o apa1480_cb.o cb_enabler.o + dummy_cs.o epic_cb.o fdomain_cs.o fmvj18x_cs.o + ibmtr_cs.o ide_cs.o iflash2+_mtd.o iflash2_mtd.o + netwave_cs.o nmclan_cs.o + parport_cs.o pcnet_cs.o qlogic_cs.o + smc91c92_cs.o sram_mtd.o tulip_cb.o wavelan_cs.o xirc2ps_cs.o + ftl_cs.o memory_cb.o memory_cs.o serial_cb.o serial_cs.o + + 8390.o nfs.o lockd.o sunrpc.o" +# 3c589_cs.o ibmtr_cs.o nmclan_cs.o pcnet_cs.o smc91c92_cs.o wavelan_cs.o +# fmvj18x_cs.o netwave_cs.o xirc2ps_cs.o 3c574_cs.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" BLOCK_DRIVERS="DAC960.o cpqarray.o" @@ -32,21 +50,26 @@ MISCMODULES="lp.o parport_pc.o parport.o loop.o" FSMODULES="vfat.o fat.o" -NETWORK_MODULES="$MISCMODULES $FSMODULES $NETWORK_DRIVERS" -CDROM_MODULES=" $MISCMODULES $FSMODULES $SCSI_DRIVERS $CD_DRIVERS isofs.o" -HD_MODULES=" $MISCMODULES $FSMODULES $SCSI_DRIVERS $BLOCK_DRIVERS" +NETWORK_MODULES="$PCMCIAMODULES $MISCMODULES $FSMODULES $NETWORK_DRIVERS" +CDROM_MODULES="$PCMCIAMODULES $MISCMODULES $FSMODULES $SCSI_DRIVERS $CD_DRIVERS isofs.o" +HD_MODULES="$PCMCIAMODULES $MISCMODULES $FSMODULES $SCSI_DRIVERS $BLOCK_DRIVERS" +PCMCIA_MODULES="$PCMCIAMODULES $PCMCIA_DRIVERS $MISCMODULES $FSMODULES" -cp -f /boot/vmlinuz-$KERNEL_VERSION vmlinuz +cp -f "$KERNEL_BOOT_PATH"/boot/vmlinuz* vmlinuz +cp -f "$KERNEL_BOOT_PATH"/boot/System.map* System.map + +#set 640x480x16 resolution on boot. /usr/sbin/rdev -v vmlinuz 785 -rm -rf modules ; install -d modules +rm -rf modules ; install -d modules (cd modules ; - 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 + cp -f `find ../"$KERNEL_BOOT_PATH"/lib/modules/ -name "*.o"` . + /sbin/depmod -m ../System.map -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 - rm -f $NETWORK_MODULES $CDROM_MODULES $HD_MODULES # leave in the directory non-install1 used modules + ls $PCMCIA_MODULES | cpio --quiet -H crc -o | gzip -9 > pcmcia_modules.cgz + rm -f $NETWORK_MODULES $CDROM_MODULES $HD_MODULES $PCMCIA_MODULES # leave in the directory non-install1 used modules ) -- cgit v1.2.1