Messages in this thread Patch in this message | | | From | Tony Jones <> | Date | Wed, 19 Apr 2006 10:49:13 -0700 | Subject | [RFC][PATCH 1/11] security: AppArmor - Integrate into kbuild |
| |
This patch glues AppArmor into the security configuration and Makefile. It also creates the AppArmor configuration and Makefile.
Signed-off-by: Tony Jones <tonyj@suse.de>
--- MAINTAINERS | 7 +++++++ security/Kconfig | 1 + security/Makefile | 1 + security/apparmor/Kconfig | 9 +++++++++ security/apparmor/Makefile | 6 ++++++ 5 files changed, 24 insertions(+)
--- linux-2.6.17-rc1.orig/MAINTAINERS +++ linux-2.6.17-rc1/MAINTAINERS @@ -284,6 +284,13 @@ W: http://www.canb.auug.org.au/~sfr/ S: Supported +APPARMOR SECURITY MODULE +P: Tony Jones +M: tonyj@suse.de +L: apparmor-dev@forge.novell.com +W: http://forge.novell.com/modules/xfmod/project/?apparmor +S: Supported + APPLETALK NETWORK LAYER P: Arnaldo Carvalho de Melo M: acme@conectiva.com.br --- linux-2.6.17-rc1.orig/security/Kconfig +++ linux-2.6.17-rc1/security/Kconfig @@ -100,6 +100,7 @@ If you are unsure how to answer this question, answer N. source security/selinux/Kconfig +source security/apparmor/Kconfig endmenu --- linux-2.6.17-rc1.orig/security/Makefile +++ linux-2.6.17-rc1/security/Makefile @@ -4,6 +4,7 @@ obj-$(CONFIG_KEYS) += keys/ subdir-$(CONFIG_SECURITY_SELINUX) += selinux +subdir-$(CONFIG_SECURITY_APPARMOR) += apparmor # if we don't select a security model, use the default capabilities ifneq ($(CONFIG_SECURITY),y) --- /dev/null +++ linux-2.6.17-rc1/security/apparmor/Kconfig @@ -0,0 +1,9 @@ +config SECURITY_APPARMOR + tristate "AppArmor support" + depends on SECURITY!=n + help + This enables the AppArmor security module. + Required userspace tools (if they are not included in your + distribution) and further information may be found at + <http://forge.novell.com/modules/xfmod/project/?apparmor> + If you are unsure how to answer this question, answer N. --- /dev/null +++ linux-2.6.17-rc1/security/apparmor/Makefile @@ -0,0 +1,6 @@ +# Makefile for AppArmor Linux Security Module +# +subdir-$(CONFIG_SECURITY_APPARMOR) += match +obj-$(CONFIG_SECURITY_APPARMOR) += apparmor.o + +apparmor-y := main.o list.o procattr.o lsm.o apparmorfs.o capabilities.o module_interface.o - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |