projects / people / pmueller / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 8f69975d BS |
1 | From: John Johansen <jjohansen@suse.de> |
| 2 | Subject: Add AppArmor LSM to security/Makefile | |
| 3 | ||
| 4 | Signed-off-by: John Johansen <jjohansen@suse.de> | |
| 5 | Signed-off-by: Andreas Gruenbacher <agruen@suse.de> | |
| 6 | ||
| 7 | --- | |
| 8 | security/Kconfig | 1 + | |
| 9 | security/Makefile | 3 ++- | |
| 10 | 2 files changed, 3 insertions(+), 1 deletion(-) | |
| 11 | ||
| 12 | --- a/security/Kconfig | |
| 13 | +++ b/security/Kconfig | |
| 14 | @@ -117,6 +117,7 @@ config SECURITY_DEFAULT_MMAP_MIN_ADDR | |
| 15 | ||
| 16 | source security/selinux/Kconfig | |
| 17 | source security/smack/Kconfig | |
| 18 | +source security/apparmor/Kconfig | |
| 19 | ||
| 20 | endmenu | |
| 21 | ||
| 22 | --- a/security/Makefile | |
| 23 | +++ b/security/Makefile | |
| 24 | @@ -14,5 +14,6 @@ obj-$(CONFIG_SECURITY) += security.o c | |
| 25 | # Must precede capability.o in order to stack properly. | |
| 26 | obj-$(CONFIG_SECURITY_SELINUX) += selinux/built-in.o | |
| 27 | obj-$(CONFIG_SECURITY_SMACK) += smack/built-in.o | |
| 28 | -obj-$(CONFIG_SECURITY_ROOTPLUG) += root_plug.o | |
| 29 | +obj-$(CONFIG_SECURITY_APPARMOR) += commoncap.o apparmor/ | |
| 30 | + obj-$(CONFIG_SECURITY_ROOTPLUG) += root_plug.o | |
| 31 | obj-$(CONFIG_CGROUP_DEVICE) += device_cgroup.o |