rpms/kernel/devel Makefile, 1.61, 1.62 config-debug, 1.6, 1.7 config-generic, 1.40, 1.41 config-nodebug, 1.7, 1.8

[Dave Jones (davej)]

Author: davej

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

Modified Files:
	Makefile config-debug config-generic config-nodebug 
Log Message:
revert recent selinux change


Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- Makefile	13 Nov 2007 23:09:22 -0000	1.61
+++ Makefile	16 Nov 2007 16:35:04 -0000	1.62
@@ -54,7 +54,6 @@
 	@perl -pi -e 's/# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set/CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_DEBUG_SG is not set/CONFIG_DEBUG_SG=y/' config-nodebug
 	@perl -pi -e 's/# CONFIG_EXT4DEV_FS is not set/CONFIG_EXT4DEV_FS=m/' config-generic
-	@perl -pi -e 's/# CONFIG_SECURITY_SELINUX_AVC_STATS is not set/CONFIG_SECURITY_SELINUX_AVC_STATS=m/' config-nodebug
 
 	@perl -pi -e 's/^%define debugbuildsenabled 1/%define debugbuildsenabled 0/' kernel.spec
 
@@ -81,7 +80,6 @@
 	@perl -pi -e 's/CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y/# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_DEBUG_SG=y/# CONFIG_DEBUG_SG is not set/' config-nodebug
 	@perl -pi -e 's/CONFIG_EXT4DEV_FS=m/# CONFIG_EXT4DEV_FS is not set/' config-generic
-	@perl -pi -e 's/CONFIG_SECURITY_SELINUX_AVC_STATS=y/# CONFIG_SECURITY_SELINUX_AVC_STATS is not set/' config-nodebug
 
 	@perl -pi -e 's/^%define debugbuildsenabled 0/%define debugbuildsenabled 1/' kernel.spec
 


Index: config-debug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-debug,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- config-debug	13 Nov 2007 23:09:22 -0000	1.6
+++ config-debug	16 Nov 2007 16:35:04 -0000	1.7
@@ -28,5 +28,3 @@
 # CONFIG_ACPI_DEBUG_FUNC_TRACE is not set
 
 CONFIG_DEBUG_SG=y
-
-CONFIG_SECURITY_SELINUX_AVC_STATS=y


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- config-generic	15 Nov 2007 19:22:02 -0000	1.40
+++ config-generic	16 Nov 2007 16:35:04 -0000	1.41
@@ -2995,6 +2995,7 @@
 CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
 CONFIG_UTS_NS=y
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- config-nodebug	14 Nov 2007 18:36:06 -0000	1.7
+++ config-nodebug	16 Nov 2007 16:35:04 -0000	1.8
@@ -27,5 +27,3 @@
 # CONFIG_ACPI_DEBUG is not set
 
 CONFIG_DEBUG_SG=y
-
-CONFIG_SECURITY_SELINUX_AVC_STATS=y