merge from taroon branch. product.img stuff, md can be modular, lots of

little things across the board

8 files changed, 18 insertions, 9 deletions

diff --git a/scripts/mk-images b/scripts/mk-images
index 68d9a9195..251ab96dc 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -36,6 +36,7 @@ TOPDIR=$(cd $TOPDIR; pwd)
     IMGPATH=$4
     KERNELBASE=/tmp/updboot.kernel.$$
     MODDEPS=$KERNELBASE/moddeps
+    MODMAPS=$KERNELBASE/modules.pcimap
     BUILDARCH=$5
 
     if [ "$BUILDARCH" = "ppc" -o "$BUILDARCH" = "ppc64" ]; then
@@ -84,6 +85,7 @@ TOPDIR=$(cd $TOPDIR; pwd)
 
 # Stuff that we need
     TRIMPCITABLE=$IMGPATH/usr/lib/anaconda-runtime/trimpcitable
+    TRIMMODMAP=$IMGPATH/usr/lib/anaconda-runtime/trimmodmap
     GETKEYMAPS=$IMGPATH/usr/lib/anaconda-runtime/getkeymaps
     KEYMAPS=/tmp/keymaps-$BUILDARCH.$$
     SCREENFONT=$IMGPATH/usr/lib/anaconda-runtime/screenfont-${BASEARCH}.gz
@@ -100,7 +102,7 @@ TOPDIR=$(cd $TOPDIR; pwd)
 
     touch $MODULESUSED
 
-    REQUIREMENTS="$TRIMPCITABLE $PCITABLE $GETMODDEPS $MODINFO
+    REQUIREMENTS="$TRIMPCITABLE $TRIMMODMAP $PCITABLE $GETMODDEPS $MODINFO
 		  $FILTERMODDEPS $LANGTABLE $GETKEYMAPS"
 
     dieLater=
@@ -170,6 +172,9 @@ rundepmod () {
     $FAKEARCH /sbin/depmod -e -F $KERNELROOT/boot/System.map-$version \
 	    $what > $final.foo 2>&1 | 
 	    egrep -v "modprobe: (${exclpattern}) multiply defined"
+    $FAKEARCH /sbin/depmod -a -F $KERNELROOT/boot/System.map-$version \
+            -b $KERNELROOT $version
+    mv $KERNELROOT/lib/modules/$version/modules.pcimap $MODMAPS
 
     # For paride we need to change this:
     # aten: paride
@@ -313,7 +318,7 @@ makemoduleball() {
     MMB_MODULESET=$(resdeps $2)
 
     rm -rf $MMB_DIR/modules $MMB_DIR/$MMB_NAME $MMB_DIR/modules.dep \
-	   $MMB_DIR/pcitable $MMB_DIR/$MMB_MODINFO
+	   $MMB_DIR/modules.pcimap $MMB_DIR/pcitable $MMB_DIR/$MMB_MODINFO
     mkdir -p $MMB_DIR/modules
 
     MMB_MODULESET=$(intcopymodules "$MMB_MODULESET" $MMB_DIR/modules)
@@ -332,6 +337,9 @@ makemoduleball() {
 
     # create the pcitable
     $TRIMPCITABLE $(find . -name *.o -exec basename {} \;) < $PCITABLE > ../pcitable
+    
+    # create the modules.pcimap
+    $TRIMMODMAP $PCITABLE $(find . -name *.o -exec basename {} \;) < $MODMAPS > ../modules.pcimap
 
     if [ -n "$MMB_DD" ]; then
 	echo $MMB_DD > $MMB_DIR/rhdd
@@ -561,6 +569,7 @@ EOF
 	$MBD_DIR urandom c 1 9 644 root:root
 	$MBD_DIR nvram c 10 144 644 root:root
 	$MBD_DIR adb c 56 0 644 root:root
+        $MBD_DIR rtc c 10 135 644 root:root
 EOF
     ln -s fb0 $MBD_DIR/dev/fb
 
diff --git a/scripts/mk-images.alpha b/scripts/mk-images.alpha
index ea8569c0e..7adc5f8fb 100644
--- a/scripts/mk-images.alpha
+++ b/scripts/mk-images.alpha
@@ -3,7 +3,7 @@ SCSIMODULES="sd_mod isp_mod ide-cd aic7xxx"
 EXTRASCSI="DAC960 cpqfc BusLogic 3w-xxxx dmx3191d dpt_i2o megaraid ncr53c8xx sym53c8xx qlogicisp qlogicfc qla2x00 qla1280 cciss cpqarray"
 EXTRANET="3c509 3c59x 8139too dl2k eepro epic100 ewrk3 hamachi natsemi ne2k-pci ns83820 starfire yellowfin"
 
-SECSTAGE="sd_mod raid0 raid1 raid5 ext3 $NETMODULES $SCSIMODULES $EXTRASCSI $EXTRANET"
+SECSTAGE="sd_mod md raid0 raid1 raid5 ext3 $NETMODULES $SCSIMODULES $EXTRASCSI $EXTRANET"
 
 prepareBootImage() {
         dd if=/dev/zero of=$MBD_TMPIMAGE bs=1k count=$BOOTDISKSIZE 2>/dev/null
diff --git a/scripts/mk-images.i386 b/scripts/mk-images.i386
index d7aa49433..dd4f53e60 100644
--- a/scripts/mk-images.i386
+++ b/scripts/mk-images.i386
@@ -92,7 +92,7 @@ IDEMODS=""
 SCSIMODS="sd_mod sg sr_mod st"
 
 FSMODS="msdos vfat ext3 reiserfs jfs"
-SECSTAGE="agpgart raid0 raid1 raid5 lvm-mod $FSMODS $IDEMODS $SCSIMODS $LATEUSBMODS st parport_pc parport"
+SECSTAGE="agpgart md raid0 raid1 raid5 lvm-mod $FSMODS $IDEMODS $SCSIMODS $LATEUSBMODS st parport_pc parport"
 
 BTERMMODULES="vga16fb"
 COMMONMODULES="vfat nfs floppy $USBMODS $BTERMMODULES"
diff --git a/scripts/mk-images.ia64 b/scripts/mk-images.ia64
index 7ce27aab1..7ba193f59 100644
--- a/scripts/mk-images.ia64
+++ b/scripts/mk-images.ia64
@@ -4,7 +4,7 @@ LATEUSBMODS="mousedev"
 
 BTERMMODULES="vga16fb"
 COMMONMODULES="nfs fat vfat cramfs loop floppy $BTERMMODULES"
-SECSTAGE="nfs fat vfat raid0 raid1 raid5 lvm-mod ext3 $LATEUSBMODS"
+SECSTAGE="nfs fat vfat md raid0 raid1 raid5 lvm-mod ext3 $LATEUSBMODS"
 NETMODULES="3c59x acenic bcm5700 e100 e1000 eepro100 hamachi sk98lin starfire sunhme tulip yellowfin tg3"
 SCSIMODULES="sd_mod sg sr_mod st scsi_mod DAC960 cciss cpqarray aic7xxx aic7xxx_mod megaraid qla1280 qla2200 qla2300 sym53c8xx sym53c8xx_2 mptscsih mptbase ips"
 IDEMODULES="ide-mod ide-probe-mod ide-disk ide-cd"
diff --git a/scripts/mk-images.ppc b/scripts/mk-images.ppc
index 25edfaba4..3a7edb6ed 100644
--- a/scripts/mk-images.ppc
+++ b/scripts/mk-images.ppc
@@ -3,7 +3,7 @@ FSMODS="msdos vfat ext3 reiserfs jfs"
 IDEMODS="ide-cd"
 SCSIMODS="sd_mod sg sr_mod st"
 LATEUSBMODS="mousedev usb-storage"
-SECSTAGE="raid0 raid1 raid5 lvm-mod $FSMODS $IDEMODS $SCSIMODS $LATEUSBMODS"
+SECSTAGE="md raid0 raid1 raid5 lvm-mod $FSMODS $IDEMODS $SCSIMODS $LATEUSBMODS"
 NETMODULES="sungem tg3 ne2k-pci 3c59x 8139too olympic
 	   de4x5 acenic pcnet32 tulip natsemi e100 e1000 airport"
 
diff --git a/scripts/mk-images.s390 b/scripts/mk-images.s390
index 47a07b0e5..98e0c66ce 100644
--- a/scripts/mk-images.s390
+++ b/scripts/mk-images.s390
@@ -433,7 +433,7 @@ fi
 IDEMODS=""
 SCSIMODS=""
 
-SECSTAGE="$IDEMODS $SCSIMODS raid0 raid1 raid5 lvm-mod"
+SECSTAGE="$IDEMODS $SCSIMODS md raid0 raid1 raid5 lvm-mod"
 
 COMMONMODULES="loop cramfs dasd_diag_mod dasd_eckd_mod dasd_fba_mod dasd_mod tape390 isofs ext3"
 LOCALMODULES="$COMMONMODULES tape390 $IDEMODS $SCSIMODS"
diff --git a/scripts/mk-images.sparc64 b/scripts/mk-images.sparc64
index cb2f57a0e..980fc2824 100644
--- a/scripts/mk-images.sparc64
+++ b/scripts/mk-images.sparc64
@@ -1,4 +1,4 @@
-SECSTAGE="vfat raid0 raid1 raid5"
+SECSTAGE="vfat md raid0 raid1 raid5"
 TILO=$IMGPATH/usr/bin/tilo
 SILO=$IMGPATH/usr/sbin/silo
 FAKEARCH=sparc64
diff --git a/scripts/mk-images.x86_64 b/scripts/mk-images.x86_64
index 9ab0f9acf..03387bc7f 100644
--- a/scripts/mk-images.x86_64
+++ b/scripts/mk-images.x86_64
@@ -37,7 +37,7 @@ IDEMODS="ide-cd"
 SCSIMODS="sd_mod sg sr_mod st"
 
 FSMODS="msdos vfat ext3 reiserfs"
-SECSTAGE="agpgart raid0 raid1 raid5 lvm-mod $FSMODS $IDEMODS $SCSIMODS $LATEUSBMODS st parport_pc parport"
+SECSTAGE="agpgart md raid0 raid1 raid5 lvm-mod $FSMODS $IDEMODS $SCSIMODS $LATEUSBMODS st parport_pc parport"
 
 BTERMMODULES="vga16fb"
 COMMONMODULES="vfat loop cramfs floppy $USBMODS $BTERMMODULES"