rpms/kernel/devel .cvsignore, 1.590, 1.591 kernel-2.6.spec, 1.3009, 1.3010 sources, 1.553, 1.554 linux-2.6-sparse-path.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Mar 22 05:47:19 UTC 2007


Author: davej

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

Modified Files:
	.cvsignore kernel-2.6.spec sources 
Removed Files:
	linux-2.6-sparse-path.patch 
Log Message:
use local sparse


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.590
retrieving revision 1.591
diff -u -r1.590 -r1.591
--- .cvsignore	20 Mar 2007 16:10:34 -0000	1.590
+++ .cvsignore	22 Mar 2007 05:47:16 -0000	1.591
@@ -1,6 +1,7 @@
 clog
 kernel-2.6.*.config
 temp-*
+sparse-0.2.tar.bz2
 kernel-2.6.20
 linux-2.6.20.tar.bz2
 patch-2.6.21-rc4.bz2


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3009
retrieving revision 1.3010
diff -u -r1.3009 -r1.3010
--- kernel-2.6.spec	22 Mar 2007 05:21:42 -0000	1.3009
+++ kernel-2.6.spec	22 Mar 2007 05:47:16 -0000	1.3010
@@ -238,7 +238,7 @@
 # List the packages used during the kernel build
 #
 BuildPreReq: module-init-tools, patch >= 2.5.4, bash >= 2.03, sh-utils, tar
-BuildPreReq: bzip2, findutils, gzip, m4, perl, make >= 3.78, diffutils, curl
+BuildPreReq: bzip2, findutils, gzip, m4, perl, make >= 3.78, diffutils
 %if %{signmodules}
 BuildPreReq: gnupg
 %endif
@@ -252,6 +252,8 @@
 Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2
 #Source1: xen-%{xen_hv_cset}.tar.bz2
 Source2: Config.mk
+%define sparsever 0.2
+Source3: sparse-%{sparsever}.tar.bz2
 
 Source10: COPYING.modules
 Source11: genkey
@@ -465,7 +467,6 @@
 
 Patch10000: linux-2.6-compile-fixes.patch
 Patch10001: linux-2.6-warnings-inline.patch
-Patch10002: linux-2.6-sparse-path.patch
 
 # Xen hypervisor patches (20000+)
 Patch20000: xen-printf-rate-limit.patch
@@ -840,15 +841,14 @@
      rm -rf deleteme.%{_target_cpu} &
   fi
 fi
-cp -rl vanilla linux-%{kversion}.%{_target_cpu}
-
-cd linux-%{kversion}.%{_target_cpu}
 
-# Download and unpack sparse.
-%define sparsever 0.2
-curl -O http://www.kernel.org/pub/software/devel/sparse/dist/sparse-%{sparsever}.tar.bz2
-tar jxf sparse-%{sparsever}.tar.bz2
+# unpack sparse.
+cd vanilla
+tar jxf %{SOURCE3}
+cd ..
 
+cp -rl vanilla linux-%{kversion}.%{_target_cpu}
+cd linux-%{kversion}.%{_target_cpu}
 
 # Update to latest upstream.
 %patch1 -p1
@@ -1135,7 +1135,6 @@
 #
 #%patch10000 -p1
 %patch10001 -p1
-%patch10002 -p1
 
 # END OF PATCH APPLICATIONS
 
@@ -1222,7 +1221,6 @@
     # Build sparse
     cd sparse-%{sparsever}
     make
-    mv sparse ..
     cd ..
 
     # Pick the right config file for the kernel we're building
@@ -1255,8 +1253,8 @@
     fi
 
     make -s ARCH=$Arch nonint_oldconfig > /dev/null
-    make -s ARCH=$Arch %{?_smp_mflags} $MakeTarget C=1
-    make -s ARCH=$Arch %{?_smp_mflags} modules C=1 || exit 1
+    make -s CHECK=sparse-%{sparsever}/sparse ARCH=$Arch %{?_smp_mflags} $MakeTarget C=1
+    make -s CHECK=sparse-%{sparsever}/sparse ARCH=$Arch %{?_smp_mflags} modules C=1 || exit 1
     rm -rf sparse-%{sparsever} sparse
 
     # Start installing the results


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/sources,v
retrieving revision 1.553
retrieving revision 1.554
diff -u -r1.553 -r1.554
--- sources	20 Mar 2007 16:10:34 -0000	1.553
+++ sources	22 Mar 2007 05:47:17 -0000	1.554
@@ -1,3 +1,4 @@
+2618cbcc9c9ac1c3c04be903fe3338a7  sparse-0.2.tar.bz2
 34b0f354819217e6a345f48ebbd8f13e  linux-2.6.20.tar.bz2
 0d3f9bfb7dab01820b6f54c9a9f33466  patch-2.6.21-rc4.bz2
 1ea9a4503dde8ff8fc7c4473c53601f3  patch-2.6.21-rc4-git5.bz2


--- linux-2.6-sparse-path.patch DELETED ---




More information about the fedora-cvs-commits mailing list