rpms/kernel/devel Makefile, 1.60, 1.61 config-debug, 1.5, 1.6 config-generic, 1.36, 1.37 config-nodebug, 1.5, 1.6 kernel.spec, 1.237, 1.238

[Dave Jones (davej)]

Author: davej

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

Modified Files:
	Makefile config-debug config-generic config-nodebug 
	kernel.spec 
Log Message:
* Tue Nov 13 2007 Dave Jones <davej at redhat.com>
- Disable CONFIG_SECURITY_SELINUX_AVC_STATS in production builds.



Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/Makefile,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- Makefile	30 Oct 2007 01:57:49 -0000	1.60
+++ Makefile	13 Nov 2007 23:09:22 -0000	1.61
@@ -53,8 +53,8 @@
 	@perl -pi -e 's/# CONFIG_FAULT_INJECTION_DEBUG_FS is not set/CONFIG_FAULT_INJECTION_DEBUG_FS=y/' config-nodebug
 	@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
 
@@ -80,8 +80,8 @@
 	@perl -pi -e 's/CONFIG_FAULT_INJECTION_DEBUG_FS=y/# CONFIG_FAULT_INJECTION_DEBUG_FS is not set/' config-nodebug
 	@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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config-debug	30 Oct 2007 01:57:49 -0000	1.5
+++ config-debug	13 Nov 2007 23:09:22 -0000	1.6
@@ -28,3 +28,5 @@
 # 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.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- config-generic	7 Nov 2007 17:26:14 -0000	1.36
+++ config-generic	13 Nov 2007 23:09:22 -0000	1.37
@@ -2990,7 +2990,6 @@
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SECURITY_SELINUX_DISABLE=y
 CONFIG_SECURITY_SELINUX_DEVELOP=y
-CONFIG_SECURITY_SELINUX_AVC_STATS=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
 CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
 CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT=y


Index: config-nodebug
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-nodebug,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- config-nodebug	30 Oct 2007 01:57:49 -0000	1.5
+++ config-nodebug	13 Nov 2007 23:09:22 -0000	1.6
@@ -27,3 +27,5 @@
 # CONFIG_ACPI_DEBUG is not set
 
 CONFIG_DEBUG_SG=y
+
+CONFIG_SECURITY_SELINUX_AVC_STATS=m


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -r1.237 -r1.238
--- kernel.spec	12 Nov 2007 22:05:50 -0000	1.237
+++ kernel.spec	13 Nov 2007 23:09:22 -0000	1.238
@@ -1664,17 +1664,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
-#                    ____ _____ ___  ____  _
-#                   / ___|_   _/ _ \|  _ \| |
-#                   \___ \ | || | | | |_) | |
-#                    ___) || || |_| |  __/|_|
-#                   |____/ |_| \___/|_|   (_)
-#
-# Builds to rawhide aren't happening yet, so if you're committing here,
-# you're probably committing to the wrong place.
-# Checkout F-8/ and commit there.
-#
 %changelog
+* Tue Nov 13 2007 Dave Jones <davej at redhat.com>
+- Disable CONFIG_SECURITY_SELINUX_AVC_STATS in production builds.
+
 * Mon Nov 12 2007 Roland McGrath <roland at redhat.com>
 - utrace rebased