Signed-off-by: John Johansen <jjohansen@xxxxxxx> Signed-off-by: Andreas Gruenbacher <agruen@xxxxxxx> --- security/Kconfig | 1 + security/Makefile | 1 + security/apparmor/Kconfig | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) --- a/security/Kconfig +++ b/security/Kconfig @@ -94,6 +94,7 @@ config SECURITY_ROOTPLUG If you are unsure how to answer this question, answer N. source security/selinux/Kconfig +source security/apparmor/Kconfig endmenu --- a/security/Makefile +++ b/security/Makefile @@ -14,5 +14,6 @@ endif obj-$(CONFIG_SECURITY) += security.o dummy.o inode.o # Must precede capability.o in order to stack properly. obj-$(CONFIG_SECURITY_SELINUX) += selinux/built-in.o +obj-$(CONFIG_SECURITY_APPARMOR) += commoncap.o apparmor/ obj-$(CONFIG_SECURITY_CAPABILITIES) += commoncap.o capability.o obj-$(CONFIG_SECURITY_ROOTPLUG) += commoncap.o root_plug.o --- a/security/apparmor/Kconfig +++ b/security/apparmor/Kconfig @@ -1,6 +1,7 @@ config SECURITY_APPARMOR tristate "AppArmor support" - depends on SECURITY!=n + depends on SECURITY + select AUDIT help This enables the AppArmor security module. Required userspace tools (if they are not included in your -- - To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
