rpms/kernel/devel kernel-2.6.spec, 1.3129, 1.3130 .cvsignore, 1.619, 1.620 sources, 1.582, 1.583

Roland McGrath (roland) fedora-extras-commits at redhat.com
Thu May 3 23:21:25 UTC 2007


Author: roland

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

Modified Files:
	kernel-2.6.spec .cvsignore sources 
Log Message:
Get sparse via BuildRequires, not local build.


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.3129
retrieving revision 1.3130
diff -u -r1.3129 -r1.3130
--- kernel-2.6.spec	3 May 2007 21:53:02 -0000	1.3129
+++ kernel-2.6.spec	3 May 2007 23:20:49 -0000	1.3130
@@ -321,14 +321,13 @@
 BuildPreReq: gnupg
 %endif
 BuildRequires: gcc >= 3.4.2, binutils >= 2.12, redhat-rpm-config
+BuildRequires: sparse >= 0.3
 BuildConflicts: rhbuildsys(DiskFree) < 500Mb
 
 
 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.3
-Source3: sparse-%{sparsever}.tar.bz2
 
 Source10: COPYING.modules
 Source11: genkey
@@ -1436,11 +1435,6 @@
 
 cd ..
 
-# unpack sparse.
-if [ ! -d sparse-%{sparsever} ] ; then
-%setup -D -T -q -a 3
-fi
-
 # Unpack the Xen tarball.
 %if %{includexen}
 cp %{SOURCE2} .
@@ -1462,12 +1456,7 @@
 %build
 
 %if %{usesparse}
-# Build sparse.
-perl -p -i -e 's/-O /-O2 -finline-functions /' sparse-%{sparsever}/Makefile
-make -C sparse-%{sparsever}
-
-# Pass these options to kernel builds.
-%define sparse_mflags	C=1 CHECK=../sparse-%{sparsever}/sparse
+%define sparse_mflags	C=1
 %endif
 
 #


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.619
retrieving revision 1.620
diff -u -r1.619 -r1.620
--- .cvsignore	1 May 2007 21:59:03 -0000	1.619
+++ .cvsignore	3 May 2007 23:20:49 -0000	1.620
@@ -1,7 +1,6 @@
 clog
 kernel-2.6.*.config
 temp-*
-sparse-0.3.tar.bz2
 kernel-2.6.21
 linux-2.6.21.tar.bz2
 patch-2.6.21.1.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.582
retrieving revision 1.583
diff -u -r1.582 -r1.583
--- sources	1 May 2007 21:59:03 -0000	1.582
+++ sources	3 May 2007 23:20:49 -0000	1.583
@@ -1,3 +1,2 @@
-6a54daf167fad7faedded8ec84db2dba  sparse-0.3.tar.bz2
 1b515f588078dfa7f4bab2634bd17e80  linux-2.6.21.tar.bz2
 c4c368f173af267a564948065ffc1689  patch-2.6.21.1.bz2




More information about the fedora-extras-commits mailing list