[kernel] r10758 - in dists/trunk/linux-2.6/debian: . config/arm

[Martin Michlmayr]

Author: tbm
Date: Sun Mar  9 14:43:51 2008
New Revision: 10758

Log:
[arm/footbridge] Disable CONFIG_KEYS and CONFIG_SECURITY because the
debian-installer image is too large.


Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/config/arm/config.footbridge

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Mar  9 14:43:51 2008
@@ -37,6 +37,8 @@
   * [mips(el)/sb1*] Enable SB1250_MAC (thanks Thomas Bogendoerfer).
   * [mipsel/r5k-cobalt] Enable CONFIG_DUMMY_CONSOLE since this might
     fix the debian-installer startup hang on Qube 2700.
+  * [arm/footbridge] Disable CONFIG_KEYS and CONFIG_SECURITY because the
+    debian-installer image is too large.
 
   [ Daniel Baumann ]
   * Added patch from unionfs upstream to export release_open_intent symbol.

Modified: dists/trunk/linux-2.6/debian/config/arm/config.footbridge
==============================================================================
--- dists/trunk/linux-2.6/debian/config/arm/config.footbridge	(original)
+++ dists/trunk/linux-2.6/debian/config/arm/config.footbridge	Sun Mar  9 14:43:51 2008
@@ -1362,15 +1362,15 @@
 #
 # Network File Systems
 #
-CONFIG_NFS_FS=y
+CONFIG_NFS_FS=m
 CONFIG_ROOT_NFS=y
-CONFIG_LOCKD=y
+CONFIG_LOCKD=m
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=m
-CONFIG_NFS_ACL_SUPPORT=y
-CONFIG_SUNRPC=y
-CONFIG_SUNRPC_GSS=y
-CONFIG_RPCSEC_GSS_KRB5=y
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_RPCSEC_GSS_KRB5=m
 # CONFIG_NCP_FS is not set
 # CONFIG_CODA_FS is not set
 # CONFIG_AFS_FS is not set
@@ -1475,19 +1475,9 @@
 #
 # Security options
 #
-CONFIG_KEYS=y
-# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITY_NETWORK=y
-CONFIG_SECURITY_NETWORK_XFRM=y
-CONFIG_SECURITY_CAPABILITIES=y
-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_KEYS is not set
+# CONFIG_SECURITY is not set
+CONFIG_SECURITY_FILE_CAPABILITIES=y
 
 #
 # Cryptographic options