This commit was manufactured by cvs2svn to create branch

'R9_0-64bit-branch'.

5 files changed, 19 insertions, 12 deletions

diff --git a/kernel/Makefile b/kernel/Makefile
index 90fad04b6..a821d3939 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -4,7 +4,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..7a8db526e 100755
--- a/kernel/check_mar.pl
+++ b/kernel/check_mar.pl
@@ -7,14 +7,13 @@ my $mar = '../mdk-stage1/mar/mar';
 
 my %sanity_check = (
     hd => [ 
-	if_(arch() !~ /x86_64/, 'aic7xxx'),
-	qw(sym53c8xx initio), 
+	qw(aic7xxx sym53c8xx initio), 
 	if_(arch() !~ /ppc/, '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 b1ce99e3f..e3a3138cf 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),
@@ -63,6 +63,7 @@ our %l = (
       ),
       '53c7,8xx',
       qw(aic7xxx pci2000 qlogicisp sym53c8xx), # ncr53c8xx
+      if_(arch() =~ /x86_64/, qw(mptbase mptscsih))
     ],
     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),
     ],
diff --git a/kernel/modules.pl b/kernel/modules.pl
index 6e8f04307..b09dfa42e 100644
--- a/kernel/modules.pl
+++ b/kernel/modules.pl
@@ -28,8 +28,9 @@ 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/, qw(tg3)),
   qw(
-  tg3 r8169
+  r8169
   apa1480_cb
   imm ppa plip
   3w-xxxx pci2220i qla2x00 i2o_block
diff --git a/kernel/update_kernel b/kernel/update_kernel
index 9cea09e7d..5d815783d 100755
--- a/kernel/update_kernel
+++ b/kernel/update_kernel
@@ -4,8 +4,13 @@ ALL_KERNELS="all.kernels"
 
 # 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,7 +43,7 @@ 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/')
+rpm=$(rpm -qp --qf '%{name}' /RPMS/kernel-BOOT-*.rpm | perl -pe 's/kernel-BOOT-((\.?[0-9]+){3})\.(.*)/$1-${3}BOOT/')
 if [ -n "$rpm" -a ! -e $ALL_KERNELS/$rpm ]; then
     [ -n "$main" ] && rm -rf $ALL_KERNELS/$main
     cd $ALL_KERNELS
@@ -91,6 +96,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