rpms/kernel/F-12 Makefile,1.108,1.109 kernel.spec,1.1801,1.1802

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13461

Modified Files:
	Makefile kernel.spec 
Log Message:
Add unused-kernel-patches Make target, change some patches to
  use ApplyOptionalPatch


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/Makefile,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -p -r1.108 -r1.109
--- Makefile	27 Jul 2009 17:42:03 -0000	1.108
+++ Makefile	15 Sep 2009 18:53:54 -0000	1.109
@@ -136,6 +136,9 @@ reconfig:
 force-tag: $(SPECFILE) $(COMMON_DIR)/branches
 	@$(MAKE) tag TAG_OPTS="-F $(TAG_OPTS)"
 
+unused-kernel-patches:
+	@for f in *.patch; do if [ -e $$f ]; then (egrep -q "^Patch[[:digit:]]+:[[:space:]]+$$f" $(SPECFILE) || echo "Unused:    $$f") && egrep -q "^ApplyPatch[[:space:]]+$$f|^ApplyOptionalPatch[[:space:]]+$$f" $(SPECFILE) || echo "Unapplied: $$f"; fi; done
+
 # since i386 isn't a target...
 compile compile-short: DIST_DEFINES += --target $(shell uname -m)
 


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1801
retrieving revision 1.1802
diff -u -p -r1.1801 -r1.1802
--- kernel.spec	15 Sep 2009 09:52:51 -0000	1.1801
+++ kernel.spec	15 Sep 2009 18:53:54 -0000	1.1802
@@ -1150,8 +1150,8 @@ ApplyOptionalPatch linux-2.6-compile-fix
 # revert patches from upstream that conflict or that we get via other means
 ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R
 
-#ApplyPatch git-cpufreq.patch
-#ApplyPatch git-bluetooth.patch
+ApplyOptionalPatch git-cpufreq.patch
+#ApplyOptionalPatch git-bluetooth.patch
 
 ApplyPatch linux-2.6-hotfixes.patch
 
@@ -2040,6 +2040,10 @@ fi
 # and build.
 
 %changelog
+* Tue Sep 15 2009 Chuck Ebbert <cebbert at redhat.com>
+- Add unused-kernel-patches Make target, change some patches to
+  use ApplyOptionalPatch
+
 * Tue Sep 15 2009 Ben Skeggs <bskeggs at redhat.com>
 - nouveau: misc fixes to context-related issues, fixes some severe nv4x bugs