[arm/footbridge] Disable CONFIG_KEYS and CONFIG_SECURITY because the
debian-installer image is too large. svn path=/dists/trunk/linux-2.6/; revision=10758
This commit is contained in:
parent
074542b5d3
commit
017eb5b9c7
|
@ -37,6 +37,8 @@ linux-2.6 (2.6.25~rc4-1~experimental.1) UNRELEASED; urgency=low
|
|||
* [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.
|
||||
|
|
|
@ -1362,15 +1362,15 @@ CONFIG_CRAMFS=y
|
|||
#
|
||||
# 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 @@ CONFIG_DEBUG_USER=y
|
|||
#
|
||||
# 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
|
||||
|
|
Loading…
Reference in New Issue