apparmor/kernel-patches/for-mainline/apparmor-intree.diff
2007-04-03 13:39:05 +00:00

28 lines
1.1 KiB
Diff

Add AppArmor LSM to security/Makefile
Signed-off-by: John Johansen <jjohansen@suse.de>
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Index: linux-2.6-apparmor/security/Kconfig
===================================================================
--- linux-2.6-apparmor.orig/security/Kconfig
+++ linux-2.6-apparmor/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
Index: linux-2.6-apparmor/security/Makefile
===================================================================
--- linux-2.6-apparmor.orig/security/Makefile
+++ linux-2.6-apparmor/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) += apparmor/
obj-$(CONFIG_SECURITY_CAPABILITIES) += commoncap.o capability.o
obj-$(CONFIG_SECURITY_ROOTPLUG) += commoncap.o root_plug.o