2007-04-05 10:04:00 +00:00
|
|
|
From: John Johansen <jjohansen@suse.de>
|
|
|
|
|
Subject: Add AppArmor LSM to security/Makefile
|
2007-04-03 07:50:09 +00:00
|
|
|
|
|
|
|
|
Signed-off-by: John Johansen <jjohansen@suse.de>
|
|
|
|
|
Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
|
|
|
|
|
|
2007-04-05 10:04:00 +00:00
|
|
|
---
|
2008-04-07 17:48:20 +00:00
|
|
|
security/Kconfig | 1 +
|
|
|
|
|
security/Makefile | 1 +
|
|
|
|
|
2 files changed, 2 insertions(+)
|
2007-04-05 10:04:00 +00:00
|
|
|
|
|
|
|
|
--- a/security/Kconfig
|
|
|
|
|
+++ b/security/Kconfig
|
2008-07-02 20:24:33 +00:00
|
|
|
@@ -126,6 +126,7 @@ config SECURITY_DEFAULT_MMAP_MIN_ADDR
|
2007-01-10 06:33:09 +00:00
|
|
|
|
|
|
|
|
source security/selinux/Kconfig
|
2008-07-02 20:24:33 +00:00
|
|
|
source security/smack/Kconfig
|
2007-01-10 06:33:09 +00:00
|
|
|
+source security/apparmor/Kconfig
|
|
|
|
|
|
|
|
|
|
endmenu
|
|
|
|
|
|
2007-04-05 10:04:00 +00:00
|
|
|
--- a/security/Makefile
|
|
|
|
|
+++ b/security/Makefile
|
2008-07-02 20:24:33 +00:00
|
|
|
@@ -16,6 +16,7 @@ obj-$(CONFIG_SECURITY) += security.o d
|
2007-01-10 06:33:09 +00:00
|
|
|
# Must precede capability.o in order to stack properly.
|
|
|
|
|
obj-$(CONFIG_SECURITY_SELINUX) += selinux/built-in.o
|
2008-07-02 20:24:33 +00:00
|
|
|
obj-$(CONFIG_SECURITY_SMACK) += commoncap.o smack/built-in.o
|
2007-04-11 00:15:58 +00:00
|
|
|
+obj-$(CONFIG_SECURITY_APPARMOR) += commoncap.o 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
|
2008-07-02 20:24:33 +00:00
|
|
|
obj-$(CONFIG_CGROUP_DEVICE) += device_cgroup.o
|
