- Strip modules on AMD64 with K. O. script

- Split network_gigabit_usb.img into network_{gigabit,usb}.img on AMD64

6 files changed, 37 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index c12c84e46..3286b9980 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ ifeq (ia64,$(ARCH))
     BOOT_IMG = all.img
 endif
 ifeq (x86_64,$(ARCH))
-    BOOT_IMG = cdrom.img hd.img hdcdrom_usb.img network.img network_gigabit_usb.img blank.img
+    BOOT_IMG = cdrom.img hd.img hdcdrom_usb.img network.img network_gigabit.img network_usb.img blank.img
 endif
 
 FBOOT_IMG = $(BOOT_IMG:%=images/%)
diff --git a/kernel/check_mar.pl b/kernel/check_mar.pl
index c288d83bd..aedbfdfe7 100755
--- a/kernel/check_mar.pl
+++ b/kernel/check_mar.pl
@@ -7,13 +7,13 @@ my $mar = '../mdk-stage1/mar/mar';
 
 my %sanity_check = (
     hd => [ 
-	if_(arch() !~ /x86_64/, 'aic7xxx'),
-	qw(sym53c8xx initio), 
-	if_(arch() !~ /ppc/, 'advansys'),
+	qw(sym53c8xx),
+	if_(arch() !~ /x86_64/, 'initio'),
+	if_(arch() !~ /ppc|x86_64/, 'advansys'),
     ],
     network => [ 
 	qw(3c59x eepro100 tulip via-rhine ne2k-pci 8139too), 
-	if_(arch() !~ /ppc|x86_64/, 'e100'), 
+	if_(arch() !~ /ppc/, 'e100'), 
 	if_(arch() !~ /ppc|ia64/, 'tlan'),
     ],
 );
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm
index e8bb71700..eb71bbbd5 100644
--- a/kernel/list_modules.pm
+++ b/kernel/list_modules.pm
@@ -16,7 +16,7 @@ our %l = (
     main => [
       if_(arch() =~ /ppc/, qw(mace bmac gmac airport)),
       if_(arch() =~ /^sparc/, qw(sunbmac sunhme sunqe)),
-      if_(arch() !~ /alpha/ && arch() !~ /sparc/,
+      if_(arch() !~ /alpha|sparc/,
         qw(3c501 3c503 3c505 3c507 3c509 3c515 3c90x),
 	qw(82596 abyss ac3200 acenic aironet4500_card at1700 atp com20020-pci),
         qw(cs89x0 de600 de620),
@@ -74,7 +74,7 @@ our %l = (
       if_(arch() =~ /^sparc/, qw(pluto)),
       if_(arch() !~ /alpha/ && arch() !~ /sparc/,
         qw(DAC960 dpt_i2o megaraid aacraid cciss cpqarray gdth i2o_block),
-	qw(cpqfc qla2200 qla2300 ataraid hptraid silraid pdcraid),
+	qw(cpqfc qla2200 qla2300 ataraid hptraid silraid pdcraid pdc-ultra),
         qw(ips ppa imm),
       ),
     ],
@@ -105,7 +105,7 @@ our %l = (
     cdrom => [ qw(isofs) ],
     loopback => [ qw(isofs loop) ],
     local => [
-      if_(arch() =~ /^i.86/, qw(vfat fat)),
+      if_(arch() =~ /^i.86|x86_64/, qw(vfat fat)),
       if_(arch() =~ /^ppc/, qw(hfs)),
       qw(reiserfs),
     ],
@@ -149,6 +149,7 @@ our %l = (
       qw(busmouse msbusmouse logibusmouse serial qpmouse atixlmouse),
     ],
     char => [
+      if_(arch() =~ /ia64/, qw(efivars)),
       qw(amd768_rng applicom n_r3964 nvram pc110pad ppdev),
       qw(mxser moxa isicom wdt_pci epca synclink istallion sonypi i810-tco sx), #- what are these???
     ],
diff --git a/kernel/modules.pl b/kernel/modules.pl
index b50fbecdc..a4b054670 100644
--- a/kernel/modules.pl
+++ b/kernel/modules.pl
@@ -25,16 +25,24 @@ my %modules_only_for_all_img = (
     qw(3c501 3c503 3c505 3c507 3c515), # unused, hopefully?
     qw(eepro 82596 de620 depca ewrk3 cs89x0),
 
+    if_(arch() =~ /x86_64/, qw(orinoco_plx)), # don't support laptop for now
+    if_(arch() =~ /x86_64/, qw(hp100 epic100)), # old (nico)
     if_(arch() =~ /alpha|ppc/, qw(sb1000)),
     qw(iph5526),
 
     qw(ac3200 at1700 atp ni5010 ni52 ni65),  #- unused from Jeff
   ],
 
+  'bus/pcmcia' => [
+    if_(arch() =~ /x86_64/, qw(pcmcia_core ds tcic yenta_socket)), # don't support laptop for now
+    if_(arch() =~ /x86_64/, qw(i82092 i82365)), # doco says "older laptops"
+  ],
+
   'disk/scsi' => [
     # ISA cards:
     qw(NCR53c406a aha152x psi240i qlogicfas qlogicfc wd7000 sim710 t128 ultrastor), '53c7,8xx',
     qw(qla2x00 in2000 pas16 a100u2w seagate g_NCR5380),
+    if_(arch() =~ /x86_64/, qw(53c7,8xx nsp32 initio advansys atp870u)), #- old
     qw(AM53C974), # deprecated by tmscsim
     qw(u14-34f), #- duplicate from ultrastor.o
     #- still used, keeping them: qw(aha1542 sym53c416),
@@ -45,6 +53,7 @@ my %modules_only_for_all_img = (
   ],
 
   'disk/hardware_raid' => [
+    if_(arch() =~ /x86_64/, qw(ataraid)), #- old
     qw(i2o_block qla2200 qla2300 cpqfc DAC960 gdth),
   ],
 );
@@ -92,6 +101,10 @@ my @modules_removed_from_stage1 = flatten_and_check(\%modules_removed_from_stage
 
 
 my %images = (
+    network_gigabit 
+            => 'fs/network network/raw network/gigabit',
+    network_usb 
+            => 'fs/network network/raw bus/usb network/usb',
     network_gigabit_usb 
             => 'fs/network network/raw bus/usb network/gigabit|usb',
     network => 'fs/network network/raw bus/pcmcia network/main',
diff --git a/kernel/update_kernel b/kernel/update_kernel
index 9a7e5b79e..f54ea5d83 100755
--- a/kernel/update_kernel
+++ b/kernel/update_kernel
@@ -3,6 +3,12 @@
 ALL_KERNELS="all.kernels"
 RPMS=/export/Mandrake/RPMS
 
+ARCH=`uname -m | sed -e 's/i.86/i386/' -e 's/sparc.*/sparc/'`
+
+if [[ "$ARCH" = "x86_64" ]]; then
+  STRIP_MODULES="yes"
+fi
+
 # move stuff to this new "kernel" directory
 if [ ! -d all.kernels ]; then
   if [ -d ../all.kernels ]; then
@@ -33,11 +39,16 @@ function create_modules() {
 }
 
 function create_modules_mar() {
+    if [[ -n "$STRIP_MODULES" ]]; then
+	echo -n "stripping $kern: "
+	$GIBASEDIR/kernel/strip_modules *.o
+	echo "done"
+    fi
     echo -n "packdrake $kern: "
     ls *.o | packdrake -b9s "modules.cz" 400000
     echo "done"
     mv modules.cz ../modules.cz-$kern
-    for i in network network_gigabit_usb cdrom hd hdcdrom_usb pcmcia all; do
+    for i in network network_gigabit_usb network_gigabit network_usb cdrom hd hdcdrom_usb pcmcia all; do
 	modules_var="${i}_modules"
 	eval "create_marfile ${i}_modules.mar \$$modules_var"
     done
@@ -46,8 +57,6 @@ function create_modules_mar() {
 
 [ -e $ALL_KERNELS/.main ] && main=$(cat $ALL_KERNELS/.main)
 
-ARCH=`uname -m | sed -e 's/i.86/i386/' -e 's/sparc.*/sparc/'`
-
 if [ "$ARCH" == "ia64" ] || [ "$ARCH" == "ppc" ]; then
 	rpm=$(rpm -qp --qf '%{name}' $RPMS/kernel-[0-9]*.rpm | perl -pe 's/kernel-((\.?[0-9]+){3})\.(.*)/$1-${3}/')
 else 
diff --git a/make_boot_img b/make_boot_img
index 85d6db50b..0a4da0620 100755
--- a/make_boot_img
+++ b/make_boot_img
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-@ARGV >= 2 or die "usage: $0 <image> all|cdrom|hd|hdcdrom_usb|network|network_gigabit_usb|blank|pcmcia|live|tftp|tftprd\n";
+@ARGV >= 2 or die "usage: $0 <image> all|cdrom|hd|hdcdrom_usb|network|network_gigabit_usb|network_gigabit|network_usb|blank|pcmcia|live|tftp|tftprd\n";
 
 use Config;
 use MDK::Common;
@@ -41,6 +41,8 @@ $install = $ {{
     tftprd => "stage1-full",
     pcmcia => "stage1-full",
     network => "stage1-network",
+    network_gigabit => "stage1-network",
+    network_usb => "stage1-network-usb",
     network_gigabit_usb => "stage1-network-usb",
     cdrom => "stage1-cdrom",
     hd => "stage1-disk",