rpms/kernel/devel kernel.spec,1.76,1.77

Roland McGrath (roland) fedora-extras-commits at redhat.com
Fri Aug 10 03:52:14 UTC 2007


Author: roland

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

Modified Files:
	kernel.spec 
Log Message:
- disable ppc64 vdso install pending eu-strip bug
- clean up spec file sh scripting



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- kernel.spec	10 Aug 2007 00:56:12 -0000	1.76
+++ kernel.spec	10 Aug 2007 03:51:42 -0000	1.77
@@ -205,7 +205,7 @@
 %define all_x86 i386 i686
 
 # These arches install vdso/ directories.
-%define vdso_arches %{all_x86} x86_64 ppc ppc64
+%define vdso_arches %{all_x86} x86_64 ppc
 %ifarch %{all_x86}
 %define vdso_subdir kernel
 %endif
@@ -1375,53 +1375,46 @@
     KEYFLAGS="$KEYFLAGS --keyring ../kernel.pub"
     export KEYFLAGS
 
-    for i in `cat modnames`
+    while read i
     do
       sh ./scripts/modsign/modsign.sh $i Red
       mv -f $i.signed $i
-    done
+    done < modnames
     unset KEYFLAGS
 %endif
     # mark modules executable so that strip-to-file can strip them
-    cat modnames | xargs chmod u+x
+    xargs --no-run-if-empty chmod u+x < modnames
+
+    # Generate a list of modules for block and networking.
+
+    fgrep /drivers/ modnames | xargs --no-run-if-empty nm -upA |
+    sed -n 's,^.*/\([^/]*\.ko\):  *U \(.*\)$,\1 \2,p' > drivers.undef
 
-    # Generate a list of modules for SCSI, sata/pata, and networking.
-    touch $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.block
-    touch $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.networking
-
-    drivers=$(grep drivers modnames)
-
-    # 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
+    collect_modules_list()
+    {
+      sed -r -n -e "s/^([^ ]+) ($2)\$/\\1/p" drivers.undef |
+      LC_ALL=C sort -u > $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.$1
+    }
+
+    collect_modules_list networking \
+    			 'register_netdev|ieee80211_register_hw|usbnet_probe'
+    collect_modules_list block \
+    			 'ata_scsi_ioctl|scsi_add_host|blk_init_queue'
 
     # detect missing or incorrect license tags
-    for i in `cat modnames`
+    rm -f modinfo
+    while read i
     do
       echo -n "$i "
       /sbin/modinfo -l $i >> modinfo
-    done
-    cat modinfo |\
-      grep -v "^GPL" |
-      grep -v "^Dual BSD/GPL" |\
-      grep -v "^Dual MPL/GPL" |\
-      grep -v "^GPL and additional rights" |\
-      grep -v "^GPL v2" && exit 1
-    rm -f modinfo
-    rm -f modnames
+    done < modnames
+
+    egrep -v \
+    	  '^GPL(v2)?|^Dual BSD/GPL|^Dual MPL/GPL|^GPL and additional rights' \
+	  modinfo && exit 1
+
+    rm -f modinfo modnames
+
     # remove files that will be auto generated by depmod at rpm -i time
     for i in alias ccwmap dep ieee1394map inputmap isapnpmap ofmap pcimap seriomap symbols usbmap
     do
@@ -1714,7 +1707,7 @@
 %if "%{elf_image_install_path}" != ""\
 %{debuginfodir}/%{elf_image_install_path}/*-%{KVERREL}%{?2}.debug\
 %endif\
-%{debuginfodir}/lib/modules/%{KVERREL}%{%?2}\
+%{debuginfodir}/lib/modules/%{KVERREL}%{?2}\
 %{debuginfodir}/usr/src/kernels/%{KVERREL}%{?2:-%{2}}-%{_target_cpu}\
 %endif\
 %endif\
@@ -1739,6 +1732,8 @@
 - fix powerpc vdso install patch
 - fix i386 vdso install patch
 - fix ppc64 build breakage from "enable -g for assembly"
+- disable ppc64 vdso install pending eu-strip bug
+- clean up spec file sh scripting
 
 * Thu Aug 09 2007 Chuck Ebbert <cebbert at redhat.com>
 - update e1000e driver




More information about the fedora-extras-commits mailing list