leave CONFIG_SECURITY in, but still get rid of SE Linux

svn path=/dists/trunk/linux-2.6/; revision=6925
This commit is contained in:
Martin Michlmayr 2006-06-29 15:43:22 +00:00
parent 3b2057c1c4
commit 163e6d3efd
3 changed files with 15 additions and 3 deletions

View File

@ -1943,7 +1943,13 @@ CONFIG_FRAME_POINTER=y
#
CONFIG_KEYS=y
# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
# CONFIG_SECURITY is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_CAPABILITIES=y
# CONFIG_SECURITY_ROOTPLUG is not set
# CONFIG_SECURITY_SECLVL is not set
# CONFIG_SECURITY_SELINUX is not set
#
# Cryptographic options

View File

@ -1943,7 +1943,13 @@ CONFIG_FRAME_POINTER=y
#
CONFIG_KEYS=y
# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
# CONFIG_SECURITY is not set
CONFIG_SECURITY=y
CONFIG_SECURITY_NETWORK=y
CONFIG_SECURITY_NETWORK_XFRM=y
CONFIG_SECURITY_CAPABILITIES=y
# CONFIG_SECURITY_ROOTPLUG is not set
# CONFIG_SECURITY_SECLVL is not set
# CONFIG_SECURITY_SELINUX is not set
#
# Cryptographic options

2
debian/changelog vendored
View File

@ -16,7 +16,7 @@ linux-2.6 (2.6.17-2) UNRELEASED; urgency=low
* [mipsel] Fix compilation error in dz serial driver.
* [mipsel] Update configs.
* [mipsel] Add a build fix for the Cobalt early console support.
* [arm/nslu2] Disable CONFIG_SECURITY for now so the kernel fits into flash.
* [arm/nslu2] Disable SE Linux support for now so the kernel fits into flash.
[ Christian T. Steigies ]
* [m68k] Update patches for 2.6.17.