rpms/kernel/devel kernel.spec,1.44,1.45

[Bill Nottingham (notting)]

Author: notting

Update of /cvs/extras/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21294

Modified Files:
	kernel.spec 
Log Message:
rework modules.* module listing of storage and network drivers
- create just 'block' and 'networking' lists
- tweak symbol lists to get the proper drivers



Index: kernel.spec
===================================================================
RCS file: /cvs/extras/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- kernel.spec	31 Jul 2007 20:32:19 -0000	1.44
+++ kernel.spec	1 Aug 2007 19:23:44 -0000	1.45
@@ -1459,40 +1459,28 @@
     cat modnames | xargs chmod u+x
 
     # Generate a list of modules for SCSI, sata/pata, and networking.
-    touch $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.scsi
-    touch $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.libata
+    touch $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.block
     touch $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.networking
-    for i in `cat modnames | grep drivers | grep -v drivers\/ata`
-    do
-      if [ $(nm $i |grep --count scsi_add_host) -ne 0 ];
-      then
-        basename `echo $i` >> $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.scsi
-      fi
-    done
-    for i in `cat modnames | grep drivers | grep -v drivers\/scsi`
-    do
-      if [ $(nm $i |grep --count blk_init_queue) -ne 0 ];
-      then
-        basename `echo $i` >> $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.scsi
-      fi
-    done
 
-    for i in `cat modnames | grep drivers\/ata`
-    do
-      if [ $(nm $i |grep --count ata_device_add) -ne 0 -o $(nm $i |grep --count ata_pci_init_one) -ne 0 ];
-      then
-        basename `echo $i` >> $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.libata
-      fi
-    done
+    drivers=$(grep drivers modnames)
 
-    for i in `cat modnames |grep drivers`
-    do
-      if [ $(nm $i |grep --count register_netdev) -ne 0 ];
-      then
-        basename `echo $i` >> $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.networking
-      fi
-    done
+    # networking
+    netsyms="register_netdev ieee80211_register_hw usbnet_probe"
 
+    for i in $drivers ; do
+      for symbol in $netsyms ; do
+      	  nm -u $i | grep -q $symbol && echo ${i##*/}
+      done
+    done | sort -u > $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.networking
+    
+    # block
+    blocksyms="ata_scsi_ioctl scsi_add_host blk_init_queue"
+    for i in $drivers ; do
+      for symbol in $blocksyms ; do
+      	  nm -u $i | grep -q $symbol && echo ${i##*/}
+      done
+    done | sort -u > $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.block
+    
     # detect missing or incorrect license tags
     for i in `cat modnames`
     do