[TOMOYO #9 (2.6.27-rc7-mm1) 6/6] Kconfig and Makefile

Kentaro Takeda
2008-09-24T09:07:32Z

Signed-off-by: Kentaro Takeda <takedakn@nttdata.co.jp>
Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
---
security/Kconfig | 1 +
security/Makefile | 2 ++
security/tomoyo/Kconfig | 11 +++++++++++
security/tomoyo/Makefile | 1 +
4 files changed, 15 insertions(+)

--- linux-2.6.27-rc7-mm1.orig/security/Kconfig
+++ linux-2.6.27-rc7-mm1/security/Kconfig
@@ -125,6 +125,7 @@ config SECURITY_DEFAULT_MMAP_MIN_ADDR

source security/selinux/Kconfig
source security/smack/Kconfig
+source security/tomoyo/Kconfig

endmenu

--- linux-2.6.27-rc7-mm1.orig/security/Makefile
+++ linux-2.6.27-rc7-mm1/security/Makefile
@@ -5,6 +5,7 @@
obj-$(CONFIG_KEYS) += keys/
subdir-$(CONFIG_SECURITY_SELINUX) += selinux
subdir-$(CONFIG_SECURITY_SMACK) += smack
+subdir-$(CONFIG_SECURITY_TOMOYO) += tomoyo

# always enable default capabilities
obj-y += commoncap.o
@@ -17,3 +18,4 @@ obj-$(CONFIG_SECURITY_SELINUX) += selin
obj-$(CONFIG_SECURITY_SMACK) += smack/built-in.o
obj-$(CONFIG_SECURITY_ROOTPLUG) += root_plug.o
obj-$(CONFIG_CGROUP_DEVICE) += device_cgroup.o
+obj-$(CONFIG_SECURITY_TOMOYO) += tomoyo/built-in.o
--- /dev/null
+++ linux-2.6.27-rc7-mm1/security/tomoyo/Kconfig
@@ -0,0 +1,11 @@
+config SECURITY_TOMOYO
+ bool "TOMOYO Linux Support"
+ depends on SECURITY
+ select SECURITYFS
+ select SECURITY_PATH
+ default n
+ help
+ This selects TOMOYO Linux, pathname-based access control.
+ Required userspace tools and further information may be
+ found at <http://tomoyo.sourceforge.jp/>.
+ If you are unsure how to answer this question, answer N.
--- /dev/null
+++ linux-2.6.27-rc7-mm1/security/tomoyo/Makefile
@@ -0,0 +1 @@
+obj-y = common.o realpath.o tomoyo.o domain.o file.o

--