rpms/kernel/devel config-generic,1.2,1.3 kernel.spec,1.3,1.4

[Dave Jones (davej)]

Author: davej

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

Modified Files:
	config-generic kernel.spec 
Log Message:
* Fri Jul 13 2007 Dave Jones <davej at redhat.com>
- Disable CONFIG_NETLABEL, it's broken right now.



Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config-generic	12 Jul 2007 19:39:19 -0000	1.2
+++ config-generic	13 Jul 2007 19:34:32 -0000	1.3
@@ -907,7 +907,8 @@
 # CONFIG_TIPC_ADVANCED is not set
 # CONFIG_TIPC_DEBUG is not set
 
-CONFIG_NETLABEL=y
+# FIXME: Disabled for now, on JamesM's request. (busted in 2.6.22git1)
+# CONFIG_NETLABEL is not set
 
 #
 # QoS and/or fair queueing


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kernel.spec	12 Jul 2007 20:57:16 -0000	1.3
+++ kernel.spec	13 Jul 2007 19:34:32 -0000	1.4
@@ -2172,6 +2172,9 @@
 %endif
 
 %changelog
+* Fri Jul 13 2007 Dave Jones <davej at redhat.com>
+- Disable CONFIG_NETLABEL, it's broken right now.
+
 * Thu Jul 12 2007 Jarod Wilson <jwilson at redhat.com>
 - Switch from using kernel-*.config files to using config-*
   files and dynamically building kernel-*.config files