merge with x86_64-branch

5 files changed, 42 insertions, 22 deletions

diff --git a/kernel/Makefile b/kernel/Makefile
index 4f424ea95..0d478b9a5 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -7,7 +7,7 @@ all.modules: ../mdk-stage1/mar/mar update_kernel list_modules.pm
 	`../tools/specific_arch ./update_kernel`
 
 ../mdk-stage1/mar/mar:
-	make -C `dirname $@`
+	make -C `dirname $@` mar
 
 clean:
 	rm -rf *~ modules.description all.modules all.modules64
diff --git a/kernel/check_mar.pl b/kernel/check_mar.pl
index d29e65088..19225410a 100755
--- a/kernel/check_mar.pl
+++ b/kernel/check_mar.pl
@@ -7,14 +7,14 @@ my $mar = '../mdk-stage1/mar/mar';
 
 my %sanity_check = (
     hd => [ 
-	if_(arch() !~ /x86_64/, 'aic7xxx'),
-	qw(sym53c8xx initio), 
-	if_(arch() !~ /ppc/, 'advansys'),
+	qw(aic7xxx 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|ia64/, 'tlan'),
+	qw(3c59x eepro100 tulip via-rhine ne2k-pci 8139too),
+	if_(arch() !~ /ppc/, 'e100'), 
+	if_(arch() !~ /ppc|x86_64|ia64/, 'tlan'),
     ],
 );
 
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm
index 0d38c874d..303fadb46 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)),
       if_(arch() =~ /^sparc/, qw(myri_sbus 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 r8169),
@@ -24,7 +24,8 @@ our %l = (
         qw(depca dmfe e100 e1000 e2100 eepro eepro100 eexpress epic100 eth16i),
         qw(ewrk3 hamachi hp hp-plus hp100 ibmtr),
         qw(lance natsemi ne ne2k-pci ni5010 ni52 ni65 nvnet olympic pcnet32 plip rcpci), #old_tulip 
-        qw(sb1000 sis900 sk98lin smc-ultra smc9194 starfire tg3 tlan tmspci tulip via-rhine), #sktr 
+        qw(sb1000 sis900 sk98lin smc-ultra smc9194 starfire tlan tmspci tulip via-rhine), #sktr 
+        qw(tg3 bcm5700),
         qw(wd winbond-840 yellowfin ns83820),
 
 	qw(iph5526), #- fibre channel
@@ -62,7 +63,7 @@ our %l = (
         qw(eata eata_pio eata_dma),
       ),
       '53c7,8xx',
-      qw(aic7xxx pci2000 qlogicisp sym53c8xx), # ncr53c8xx
+      qw(aic7xxx pci2000 qlogicisp sym53c8xx mptscsih mptbase), # ncr53c8xx
     ],
     hardware_raid => [
       if_(arch() =~ /^sparc/, qw(pluto)),
@@ -99,7 +100,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),
     ],
@@ -143,6 +144,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 235853f3e..a5b210ffe 100644
--- a/kernel/modules.pl
+++ b/kernel/modules.pl
@@ -28,6 +28,7 @@ my @skip_modules_on_stage1 = (
   qw(sktr tmspci ibmtr abyss), # alt token ring
   qw(old_tulip rtl8139),
   if_(arch() =~ /alpha|ppc/, qw(sb1000)),
+  if_(arch() !~ /x86_64|ia64/, qw(tg3 bcm5700)), #- important gigabit cards
   qw(
   r8169
   apa1480_cb
@@ -37,6 +38,7 @@ my @skip_modules_on_stage1 = (
   qla2200 qla2300
   iph5526
   ),
+  if_(arch() =~ /x86_64/, qw(53c7,8xx initio ataraid advansys atp870u)), #- old
   'AM53C974', # deprecated by tmscsim
   qw(ac3200 at1700 atp ni5010 ni52 ni65),  #- unused from Jeff
   "u14-34f", #- duplicate from ultrastor.o
diff --git a/kernel/update_kernel b/kernel/update_kernel
index 8ab1d2e5d..b778fd150 100755
--- a/kernel/update_kernel
+++ b/kernel/update_kernel
@@ -1,11 +1,17 @@
 #!/bin/bash
 
 ALL_KERNELS="all.kernels"
+RPMS=/RPMS
 
 # move stuff to this new "kernel" directory
 if [ ! -d all.kernels ]; then
-  mv ../all.kernels .
-  rm -rf ../all.modules
+  if [ -d ../all.kernels ]; then
+    mv ../all.kernels .
+    rm -rf ../all.modules
+  else
+    # make sure "all.kernels" directory exists
+    mkdir all.kernels
+  fi
 fi
 
 function create_marfile() {
@@ -38,13 +44,23 @@ function create_modules() {
 
 [ -e $ALL_KERNELS/.main ] && main=$(cat $ALL_KERNELS/.main)
 
-rpm=$(rpm -qp --qf '%{name}' /RPMS/kernel-BOOT-*.rpm | perl -pe 's/kernel-BOOT-(.*)\.(.*)/$1-${2}BOOT/')
+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 
+	rpm=$(rpm -qp --qf '%{name}' $RPMS/kernel-BOOT-*.rpm | perl -pe 's/kernel-BOOT-((\.?[0-9]+){3})\.(.*)/$1-${3}BOOT/')
+fi
 if [ -n "$rpm" -a ! -e $ALL_KERNELS/$rpm ]; then
     [ -n "$main" ] && rm -rf $ALL_KERNELS/$main
     cd $ALL_KERNELS
     rm -rf $rpm ; mkdir $rpm
     cd $rpm
-    rpm2cpio /RPMS/kernel-BOOT-*.rpm | cpio -id
+    if [ "$ARCH" == "ia64" ] || [ "$ARCH" == "ppc" ]; then
+      rpm2cpio $RPMS/kernel-[0-9]*.rpm | cpio -id
+    else
+      rpm2cpio $RPMS/kernel-BOOT-*.rpm | cpio -id
+    fi
     find -type f -name "*.o.gz" | xargs gunzip
     cd ../..
 
@@ -61,7 +77,6 @@ fi
     cd ..
 }
 
-ARCH=`uname -m | sed -e 's/i.86/i386/' -e 's/sparc.*/sparc/'`
 
 eval `perl modules.pl images`
 
@@ -70,12 +85,12 @@ if [ "$ARCH" == "i386" ]; then
 	#disable any existing resolution!!!
 	/usr/sbin/rdev -v $i 65535 #788 #785 
     done
-else
-    if [ "$ARCH" == "ppc" ]; then
-        cp -f "$KERNEL_BOOT_PATH"/boot/vmlinux .
-    else
-        cp -f "$KERNEL_BOOT_PATH"/boot/vmlinux.gz .
-    fi
+elif [ "$ARCH" == "ppc" ]; then
+    cp -f "$KERNEL_BOOT_PATH"/boot/vmlinux .
+elif [ "$ARCH" == "ia64" ]; then
+    cp -f "$KERNEL_BOOT_PATH"/boot/efi/vmlinuz* .
+else	
+    cp -f "$KERNEL_BOOT_PATH"/boot/vmlinuz* .
 fi
 
 
@@ -91,6 +106,7 @@ for i in $ALL_KERNELS/*; do
 		create_modules ../../$i $kern
 	    else
 		echo "$kern ($main)"
+		find ../../$i -type f -name "*.o.gz" | xargs gunzip
 		create_modules ../../$i $kern 2>/dev/null
 	    fi
 	) || exit 1