From 3ea67e909b550894df30aaf016f7604c87562734 Mon Sep 17 00:00:00 2001 From: Arnaud Patard Date: Sun, 8 Jan 2012 10:37:18 +0000 Subject: [PATCH] Make sure that kernel image is not too big on armel by disabling apparmor and tomoyo svn path=/dists/trunk/linux-2.6/; revision=18472 --- debian/changelog | 3 +++ debian/config/armel/config | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/debian/changelog b/debian/changelog index 01b7d02a7..d64793a24 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,9 @@ linux-2.6 (3.2-1~experimental.1) UNRELEASED; urgency=low [ Bastian Blank ] * crypt: Enable some amd64 only ciphers. + [ Arnaud Patard ] + * disable tomoyo and apparmor to allow kernel image to fit into flash. + -- Ben Hutchings Mon, 02 Jan 2012 02:55:28 +0000 linux-2.6 (3.2~rc7-1~experimental.1) experimental; urgency=low diff --git a/debian/config/armel/config b/debian/config/armel/config index 74965ee74..3d18bfe2a 100644 --- a/debian/config/armel/config +++ b/debian/config/armel/config @@ -104,3 +104,14 @@ CONFIG_YAM=m 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 + +