rpms/kernel/devel kernel-2.6.spec,1.1524,1.1525

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Aug 29 01:26:25 UTC 2005


Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv18618

Modified Files:
	kernel-2.6.spec 
Log Message:
Don't search for modules multiple times.
build ia64 again
increase x86-64 cpu count.




Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1524
retrieving revision 1.1525
diff -u -r1.1524 -r1.1525
--- kernel-2.6.spec	29 Aug 2005 00:50:24 -0000	1.1524
+++ kernel-2.6.spec	29 Aug 2005 01:26:15 -0000	1.1525
@@ -165,7 +165,7 @@
 Version: %{rpmversion}
 Release: %{release}
 #ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 ppc64iseries s390 s390x ia64 sparc sparc64
-ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 s390x sparc sparc64
+ExclusiveArch: noarch %{all_x86} x86_64 ppc ppc64 s390x ia64 sparc sparc64
 ExclusiveOS: Linux
 Provides: kernel = %{version}
 Provides: kernel-drm = 4.3.0
@@ -962,7 +962,13 @@
 	KEYFLAGS="$KEYFLAGS --secret-keyring ../kernel.sec" 
 	KEYFLAGS="$KEYFLAGS --keyring ../kernel.pub" 
 	export KEYFLAGS 
-    for i in ` find $RPM_BUILD_ROOT/lib/modules/$KernelVer -name "*.ko" -type f`
+
+    find $RPM_BUILD_ROOT/lib/modules/$KernelVer -name "*.ko" -type f >modnames
+	echo ---------modnames----------
+	cat modnames
+	echo -------modnames end--------
+
+    for i in `cat modnames`
 	do
 		sh ./scripts/modsign/modsign.sh $i Red
         mv -f $i.signed $i
@@ -971,10 +977,10 @@
 %endif
 
     # mark modules executable so that strip-to-file can strip them
-    find $RPM_BUILD_ROOT/lib/modules/$KernelVer -name "*.ko" -type f  | xargs chmod u+x
+    cat modnames | xargs chmod u+x
 
     # detect missing or incorrect license tags
-    for i in `find $RPM_BUILD_ROOT/lib/modules/$KernelVer -name "*.ko" `
+    for i in `cat modnames`
 	do
 		echo -n "$i " 
 		/sbin/modinfo -l $i >> modinfo
@@ -986,6 +992,7 @@
 		grep -v "^GPL and additional rights" |\
 		grep -v "^GPL v2" && exit 1 
     rm -f modinfo
+	rm -f modnames
     # remove files that will be auto generated by depmod at rpm -i time
     rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.*
 




More information about the fedora-cvs-commits mailing list