2007-04-03 07:50:09 +00:00
|
|
|
Add AppArmor LSM to security/Makefile
|
|
|
|
|
|
|
|
|
|
Signed-off-by: John Johansen <jjohansen@suse.de>
|
|
|
|
|
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
|
|
|
|
|
|
2007-04-03 13:39:05 +00:00
|
|
|
Index: linux-2.6-apparmor/security/Kconfig
|
2007-01-10 06:33:09 +00:00
|
|
|
===================================================================
|
2007-04-03 13:39:05 +00:00
|
|
|
--- linux-2.6-apparmor.orig/security/Kconfig
|
|
|
|
|
+++ linux-2.6-apparmor/security/Kconfig
|
2007-01-10 06:33:09 +00:00
|
|
|
@@ -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
|
|
|
|
|
|
2007-04-03 13:39:05 +00:00
|
|
|
Index: linux-2.6-apparmor/security/Makefile
|
2007-01-10 06:33:09 +00:00
|
|
|
===================================================================
|
2007-04-03 13:39:05 +00:00
|
|
|
--- linux-2.6-apparmor.orig/security/Makefile
|
|
|
|
|
+++ linux-2.6-apparmor/security/Makefile
|
|
|
|
|
@@ -14,5 +14,6 @@ endif
|
2007-01-10 06:33:09 +00:00
|
|
|
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
|
2007-04-03 13:39:05 +00:00
|
|
|
+obj-$(CONFIG_SECURITY_APPARMOR) += apparmor/
|
2007-01-10 06:33:09 +00:00
|
|
|
obj-$(CONFIG_SECURITY_CAPABILITIES) += commoncap.o capability.o
|
|
|
|
|
obj-$(CONFIG_SECURITY_ROOTPLUG) += commoncap.o root_plug.o
|
