diff options
| author | Eric Paris <eparis@redhat.com> | 2008-08-22 17:35:57 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-08-28 02:47:42 +0200 |
| commit | da31894ed7b654e2e1741e7ac4ef6c15be0dd14b (patch) | |
| tree | 7247357082b105a4aab13a2fb7dad73886f1a9e5 /security | |
| parent | Merge branch 'master' into next (diff) | |
| download | linux-da31894ed7b654e2e1741e7ac4ef6c15be0dd14b.tar.xz linux-da31894ed7b654e2e1741e7ac4ef6c15be0dd14b.zip | |
securityfs: do not depend on CONFIG_SECURITY
Add a new Kconfig option SECURITYFS which will build securityfs support
but does not require CONFIG_SECURITY. The only current user of
securityfs does not depend on CONFIG_SECURITY and there is no reason the
full LSM needs to be built to build this fs.
Signed-off-by: Eric Paris <eparis@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security')
| -rw-r--r-- | security/Kconfig | 8 | ||||
| -rw-r--r-- | security/Makefile | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/security/Kconfig b/security/Kconfig index 559293922a47..d9f47ce7e207 100644 --- a/security/Kconfig +++ b/security/Kconfig @@ -51,6 +51,14 @@ config SECURITY If you are unsure how to answer this question, answer N. +config SECURITYFS + bool "Enable the securityfs filesystem" + help + This will build the securityfs filesystem. It is currently used by + the TPM bios character driver. It is not used by SELinux or SMACK. + + If you are unsure how to answer this question, answer N. + config SECURITY_NETWORK bool "Socket and Networking Security Hooks" depends on SECURITY diff --git a/security/Makefile b/security/Makefile index f65426099aa6..c05c127fff9a 100644 --- a/security/Makefile +++ b/security/Makefile @@ -10,7 +10,8 @@ subdir-$(CONFIG_SECURITY_SMACK) += smack obj-y += commoncap.o # Object file lists -obj-$(CONFIG_SECURITY) += security.o capability.o inode.o +obj-$(CONFIG_SECURITY) += security.o capability.o +obj-$(CONFIG_SECURITYFS) += inode.o # Must precede capability.o in order to stack properly. obj-$(CONFIG_SECURITY_SELINUX) += selinux/built-in.o obj-$(CONFIG_SECURITY_SMACK) += smack/built-in.o |