[armhf] Enable SECURITY_APPARMOR, SECURITY_TOMOYO

These were disabled for armel in 3.2.1-1 due to size concerns, but
the armel config (now in kernelarch-arm) is shared by armhf.  Move
the overrides into a new armel-specific config.

svn path=/dists/trunk/linux/; revision=21231
This commit is contained in:
Ben Hutchings 2014-04-14 01:07:22 +00:00
parent 0206509812
commit 013ff4de45
4 changed files with 12 additions and 10 deletions

1
debian/changelog vendored
View File

@ -1,6 +1,7 @@
linux (3.14-1~exp2) UNRELEASED; urgency=medium
* [armel] Disable ixp4xx flavour (fixes FTBFS)
* [armhf] Enable SECURITY_APPARMOR, SECURITY_TOMOYO
-- Ben Hutchings <ben@decadent.org.uk> Mon, 14 Apr 2014 01:58:22 +0100

10
debian/config/armel/config vendored Normal file
View File

@ -0,0 +1,10 @@
##
## file: security/apparmor/Kconfig
##
# CONFIG_SECURITY_APPARMOR is not set
##
## file: security/tomoyo/Kconfig
##
# CONFIG_SECURITY_TOMOYO is not set

View File

@ -11,6 +11,7 @@ kernel-arch: arm
suggests: fdutils
configs:
kernelarch-arm/config
armel/config
[relations]
headers%gcc-4.8: linux-compiler-gcc-4.8-arm

View File

@ -118,13 +118,3 @@ CONFIG_CPU_THERMAL=y
CONFIG_XZ_DEC_ARM=y
CONFIG_XZ_DEC_ARMTHUMB=y
##
## file: security/apparmor/Kconfig
##
# CONFIG_SECURITY_APPARMOR is not set
##
## file: security/tomoyo/Kconfig
##
# CONFIG_SECURITY_TOMOYO is not set