From 163e6d3efdaf99f20751184def419077cbf9ee82 Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Thu, 29 Jun 2006 15:43:22 +0000 Subject: [PATCH] leave CONFIG_SECURITY in, but still get rid of SE Linux svn path=/dists/trunk/linux-2.6/; revision=6925 --- debian/arch/arm/config.nslu2 | 8 +++++++- debian/arch/armeb/config.nslu2 | 8 +++++++- debian/changelog | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/debian/arch/arm/config.nslu2 b/debian/arch/arm/config.nslu2 index b9d9c28ec..deb98ef92 100644 --- a/debian/arch/arm/config.nslu2 +++ b/debian/arch/arm/config.nslu2 @@ -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 diff --git a/debian/arch/armeb/config.nslu2 b/debian/arch/armeb/config.nslu2 index e70ac8c20..8f136a054 100644 --- a/debian/arch/armeb/config.nslu2 +++ b/debian/arch/armeb/config.nslu2 @@ -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 diff --git a/debian/changelog b/debian/changelog index 0b074e8fa..2c646533e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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.