2007-03-19 11:11:05 +00:00
|
|
|
Index: b/security/Makefile
|
2006-10-13 05:12:41 +00:00
|
|
|
===================================================================
|
2007-03-19 11:11:05 +00:00
|
|
|
--- a/security/Makefile
|
|
|
|
|
+++ b/security/Makefile
|
2006-10-13 05:12:41 +00:00
|
|
|
@@ -4,6 +4,7 @@
|
|
|
|
|
|
|
|
|
|
obj-$(CONFIG_KEYS) += keys/
|
|
|
|
|
subdir-$(CONFIG_SECURITY_SELINUX) += selinux
|
|
|
|
|
+obj-$(CONFIG_SECURITY_APPARMOR) += commoncap.o apparmor/
|
|
|
|
|
|
|
|
|
|
# if we don't select a security model, use the default capabilities
|
|
|
|
|
ifneq ($(CONFIG_SECURITY),y)
|
2007-03-19 11:11:05 +00:00
|
|
|
Index: b/security/Kconfig
|
|
|
|
|
===================================================================
|
|
|
|
|
--- a/security/Kconfig
|
|
|
|
|
+++ b/security/Kconfig
|
|
|
|
|
@@ -100,6 +100,7 @@ config SECURITY_SECLVL
|
|
|
|
|
If you are unsure how to answer this question, answer N.
|
|
|
|
|
|
2006-10-13 05:12:41 +00:00
|
|
|
source security/selinux/Kconfig
|
|
|
|
|
+source security/apparmor/Kconfig
|
2007-03-19 11:11:05 +00:00
|
|
|
|
2006-10-13 05:12:41 +00:00
|
|
|
endmenu
|
2007-03-19 11:11:05 +00:00
|
|
|
|
