packages: kernel/kernel.spec - added vanilla bcond: disables all patches an...

sparky sparky at pld-linux.org
Sun May 1 16:24:00 CEST 2011


Author: sparky                       Date: Sun May  1 14:24:00 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added vanilla bcond: disables all patches and extra configs

---- Files affected:
packages/kernel:
   kernel.spec (1.909 -> 1.910) 

---- Diffs:

================================================================
Index: packages/kernel/kernel.spec
diff -u packages/kernel/kernel.spec:1.909 packages/kernel/kernel.spec:1.910
--- packages/kernel/kernel.spec:1.909	Sat Apr 23 11:14:31 2011
+++ packages/kernel/kernel.spec	Sun May  1 16:23:54 2011
@@ -41,8 +41,8 @@
 %bcond_without	vserver		# support for VServer (enabled by default)
 %bcond_without	tuxonice	# support for tuxonice (ex-suspend2) (enabled by default)
 
+%bcond_with	vanilla		# don't include any patches
 %bcond_with	rescuecd	# build kernel for our rescue
-
 %bcond_with	myown		# build with your own config (kernel-myown.config)
 
 %{?debug:%define with_verbose 1}
@@ -670,6 +670,8 @@
 %{__bzip2} -dc %{SOURCE1} | patch -p1 -s
 %endif
 
+%if %{without vanilla}
+
 # tuxonice:
 %if %{with tuxonice}
 %patch69 -p1
@@ -801,6 +803,8 @@
 # virtio-gl
 %patch400 -p1
 
+%endif # vanilla
+
 # Small fixes:
 %patch2000 -p1
 %patch2001 -p1
@@ -983,6 +987,7 @@
 		$RPM_SOURCE_DIR/kernel-%{alt_kernel}.config \
 %endif
 		important.config \
+%if %{without vanilla}
 %if %{with rescuecd}
 		%{SOURCE58} \
 		%{SOURCE59} \
@@ -1019,6 +1024,7 @@
 %endif
 		%{SOURCE40} %{?0:netfilter} \
 		%{SOURCE41} %{?0:patches} \
+%endif
 		%{SOURCE20} \
 		$RPM_SOURCE_DIR/$Config
 }
@@ -1532,6 +1538,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.910  2011/05/01 14:23:54  sparky
+- added vanilla bcond: disables all patches and extra configs
+
 Revision 1.909  2011/04/23 09:14:31  baggins
 - rel 2
 - fixed/updated grsec patch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel.spec?r1=1.909&r2=1.910&f=u



More information about the pld-cvs-commit mailing list