[kernel] r18472 - in dists/trunk/linux-2.6/debian: . config/armel

[Arnaud Patard]

Author: rtp-guest
Date: Sun Jan  8 10:37:18 2012
New Revision: 18472

Log:
Make sure that kernel image is not too big on armel by disabling apparmor and tomoyo

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/armel/config

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Sun Jan  8 10:36:11 2012	(r18471)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Jan  8 10:37:18 2012	(r18472)
@@ -16,6 +16,9 @@
   [ Bastian Blank ]
   * crypt: Enable some amd64 only ciphers.
 
+  [ Arnaud Patard ]
+  * disable tomoyo and apparmor to allow kernel image to fit into flash.
+
  -- Ben Hutchings <ben at decadent.org.uk>  Mon, 02 Jan 2012 02:55:28 +0000
 
 linux-2.6 (3.2~rc7-1~experimental.1) experimental; urgency=low

Modified: dists/trunk/linux-2.6/debian/config/armel/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config	Sun Jan  8 10:36:11 2012	(r18471)
+++ dists/trunk/linux-2.6/debian/config/armel/config	Sun Jan  8 10:37:18 2012	(r18472)
@@ -104,3 +104,14 @@
 CONFIG_KERNEL_LZMA=y
 ## end choice
 
+##
+## file: security/apparmor/Kconfig
+##
+# CONFIG_SECURITY_APPARMOR is not set
+
+##
+## file: security/tomoyo/Kconfig
+##
+# CONFIG_SECURITY_TOMOYO is not set
+
+