[kernel] r6941 - in dists/sid/linux-2.6.16/debian: . arch/arm

[Martin Michlmayr]

Author: tbm
Date: Sun Jul  2 11:21:41 2006
New Revision: 6941

Modified:
   dists/sid/linux-2.6.16/debian/arch/arm/config.nslu2
   dists/sid/linux-2.6.16/debian/arch/armeb/config.nslu2
   dists/sid/linux-2.6.16/debian/changelog

Log:
[arm/nslu2] Disable SE Linux support for now so the kernel fits into flash.


Modified: dists/sid/linux-2.6.16/debian/arch/arm/config.nslu2
==============================================================================
--- dists/sid/linux-2.6.16/debian/arch/arm/config.nslu2	(original)
+++ dists/sid/linux-2.6.16/debian/arch/arm/config.nslu2	Sun Jul  2 11:21:41 2006
@@ -1916,15 +1916,9 @@
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
-CONFIG_SECURITY_ROOTPLUG=m
-CONFIG_SECURITY_SECLVL=m
-CONFIG_SECURITY_SELINUX=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
-CONFIG_SECURITY_SELINUX_DISABLE=y
-CONFIG_SECURITY_SELINUX_DEVELOP=y
-CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
+# CONFIG_SECURITY_ROOTPLUG is not set
+# CONFIG_SECURITY_SECLVL is not set
+# CONFIG_SECURITY_SELINUX is not set
 
 #
 # Cryptographic options

Modified: dists/sid/linux-2.6.16/debian/arch/armeb/config.nslu2
==============================================================================
--- dists/sid/linux-2.6.16/debian/arch/armeb/config.nslu2	(original)
+++ dists/sid/linux-2.6.16/debian/arch/armeb/config.nslu2	Sun Jul  2 11:21:41 2006
@@ -1486,15 +1486,9 @@
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_CAPABILITIES=y
-CONFIG_SECURITY_ROOTPLUG=m
-CONFIG_SECURITY_SECLVL=m
-CONFIG_SECURITY_SELINUX=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM=y
-CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=0
-CONFIG_SECURITY_SELINUX_DISABLE=y
-CONFIG_SECURITY_SELINUX_DEVELOP=y
-CONFIG_SECURITY_SELINUX_AVC_STATS=y
-CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
+# CONFIG_SECURITY_ROOTPLUG is not set
+# CONFIG_SECURITY_SECLVL is not set
+# CONFIG_SECURITY_SELINUX is not set
 
 #
 # Cryptographic options

Modified: dists/sid/linux-2.6.16/debian/changelog
==============================================================================
--- dists/sid/linux-2.6.16/debian/changelog	(original)
+++ dists/sid/linux-2.6.16/debian/changelog	Sun Jul  2 11:21:41 2006
@@ -4,6 +4,9 @@
   * [powerpc] Added console=hvc0 default commandline option to powerpc64 flavour.
   * [powerpc] Now THERM_PM72 and all WINDFARMs are builtin, for better fan control.
 
+  [ Martin Michlmayr ]
+  * [arm/nslu2] Disable SE Linux support for now so the kernel fits into flash.
+
  -- Jurij Smakov <jurij at debian.org>  Sat, 24 Jun 2006 11:22:08 -0700
 
 linux-2.6.16 (2.6.16-15) unstable; urgency=low