[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:
parent
0206509812
commit
013ff4de45
|
@ -1,6 +1,7 @@
|
||||||
linux (3.14-1~exp2) UNRELEASED; urgency=medium
|
linux (3.14-1~exp2) UNRELEASED; urgency=medium
|
||||||
|
|
||||||
* [armel] Disable ixp4xx flavour (fixes FTBFS)
|
* [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
|
-- Ben Hutchings <ben@decadent.org.uk> Mon, 14 Apr 2014 01:58:22 +0100
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
##
|
||||||
|
## file: security/apparmor/Kconfig
|
||||||
|
##
|
||||||
|
# CONFIG_SECURITY_APPARMOR is not set
|
||||||
|
|
||||||
|
##
|
||||||
|
## file: security/tomoyo/Kconfig
|
||||||
|
##
|
||||||
|
# CONFIG_SECURITY_TOMOYO is not set
|
||||||
|
|
|
@ -11,6 +11,7 @@ kernel-arch: arm
|
||||||
suggests: fdutils
|
suggests: fdutils
|
||||||
configs:
|
configs:
|
||||||
kernelarch-arm/config
|
kernelarch-arm/config
|
||||||
|
armel/config
|
||||||
|
|
||||||
[relations]
|
[relations]
|
||||||
headers%gcc-4.8: linux-compiler-gcc-4.8-arm
|
headers%gcc-4.8: linux-compiler-gcc-4.8-arm
|
||||||
|
|
|
@ -118,13 +118,3 @@ CONFIG_CPU_THERMAL=y
|
||||||
CONFIG_XZ_DEC_ARM=y
|
CONFIG_XZ_DEC_ARM=y
|
||||||
CONFIG_XZ_DEC_ARMTHUMB=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
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue