security: remove unneeded subdir-$(CONFIG_...)

Started by Masahiro Yamada on May 28, 2021 · 3 messages from 1 author · Last reply Aug 24, 2021

Subsystems (2)

Maintainers (4)

STALE1904d

open the first message on its own page

Message details and related content
All of these are unneeded. The directories to descend are specified
by obj-$(CONFIG_...).

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
---

 security/Makefile | 11 -----------
 1 file changed, 11 deletions(-)
diff --git a/security/Makefile b/security/Makefile
index 47e432900e24..18121f8f85cd 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -4,16 +4,6 @@
 #
 
 obj-$(CONFIG_KEYS)			+= keys/
-subdir-$(CONFIG_SECURITY_SELINUX)	+= selinux
-subdir-$(CONFIG_SECURITY_SMACK)		+= smack
-subdir-$(CONFIG_SECURITY_TOMOYO)        += tomoyo
-subdir-$(CONFIG_SECURITY_APPARMOR)	+= apparmor
-subdir-$(CONFIG_SECURITY_YAMA)		+= yama
-subdir-$(CONFIG_SECURITY_LOADPIN)	+= loadpin
-subdir-$(CONFIG_SECURITY_SAFESETID)    += safesetid
-subdir-$(CONFIG_SECURITY_LOCKDOWN_LSM)	+= lockdown
-subdir-$(CONFIG_BPF_LSM)		+= bpf
-subdir-$(CONFIG_SECURITY_LANDLOCK)	+= landlock
 
 # always enable default capabilities
 obj-y					+= commoncap.o
@@ -36,5 +26,4 @@ obj-$(CONFIG_BPF_LSM)			+= bpf/
 obj-$(CONFIG_SECURITY_LANDLOCK)		+= landlock/
 
 # Object integrity file lists
-subdir-$(CONFIG_INTEGRITY)		+= integrity
 obj-$(CONFIG_INTEGRITY)			+= integrity/
-- 
2.27.0
Message details and related content
On Sat, May 29, 2021 at 3:02 AM Masahiro Yamada [off-list ref] wrote:
All of these are unneeded. The directories to descend are specified
by obj-$(CONFIG_...).

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

Ping?



quoted hunk
---

 security/Makefile | 11 -----------
 1 file changed, 11 deletions(-)
diff --git a/security/Makefile b/security/Makefile
index 47e432900e24..18121f8f85cd 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -4,16 +4,6 @@
 #

 obj-$(CONFIG_KEYS)                     += keys/
-subdir-$(CONFIG_SECURITY_SELINUX)      += selinux
-subdir-$(CONFIG_SECURITY_SMACK)                += smack
-subdir-$(CONFIG_SECURITY_TOMOYO)        += tomoyo
-subdir-$(CONFIG_SECURITY_APPARMOR)     += apparmor
-subdir-$(CONFIG_SECURITY_YAMA)         += yama
-subdir-$(CONFIG_SECURITY_LOADPIN)      += loadpin
-subdir-$(CONFIG_SECURITY_SAFESETID)    += safesetid
-subdir-$(CONFIG_SECURITY_LOCKDOWN_LSM) += lockdown
-subdir-$(CONFIG_BPF_LSM)               += bpf
-subdir-$(CONFIG_SECURITY_LANDLOCK)     += landlock

 # always enable default capabilities
 obj-y                                  += commoncap.o
@@ -36,5 +26,4 @@ obj-$(CONFIG_BPF_LSM)                 += bpf/
 obj-$(CONFIG_SECURITY_LANDLOCK)                += landlock/

 # Object integrity file lists
-subdir-$(CONFIG_INTEGRITY)             += integrity
 obj-$(CONFIG_INTEGRITY)                        += integrity/
--
2.27.0

-- 
Best Regards
Masahiro Yamada
Message details and related content
On Sat, Jul 31, 2021 at 3:02 PM Masahiro Yamada [off-list ref] wrote:
On Sat, May 29, 2021 at 3:02 AM Masahiro Yamada [off-list ref] wrote:
quoted
All of these are unneeded. The directories to descend are specified
by obj-$(CONFIG_...).

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

Ping?


Applied to linux-kbuild.



quoted
---

 security/Makefile | 11 -----------
 1 file changed, 11 deletions(-)
diff --git a/security/Makefile b/security/Makefile
index 47e432900e24..18121f8f85cd 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -4,16 +4,6 @@
 #

 obj-$(CONFIG_KEYS)                     += keys/
-subdir-$(CONFIG_SECURITY_SELINUX)      += selinux
-subdir-$(CONFIG_SECURITY_SMACK)                += smack
-subdir-$(CONFIG_SECURITY_TOMOYO)        += tomoyo
-subdir-$(CONFIG_SECURITY_APPARMOR)     += apparmor
-subdir-$(CONFIG_SECURITY_YAMA)         += yama
-subdir-$(CONFIG_SECURITY_LOADPIN)      += loadpin
-subdir-$(CONFIG_SECURITY_SAFESETID)    += safesetid
-subdir-$(CONFIG_SECURITY_LOCKDOWN_LSM) += lockdown
-subdir-$(CONFIG_BPF_LSM)               += bpf
-subdir-$(CONFIG_SECURITY_LANDLOCK)     += landlock

 # always enable default capabilities
 obj-y                                  += commoncap.o
@@ -36,5 +26,4 @@ obj-$(CONFIG_BPF_LSM)                 += bpf/
 obj-$(CONFIG_SECURITY_LANDLOCK)                += landlock/

 # Object integrity file lists
-subdir-$(CONFIG_INTEGRITY)             += integrity
 obj-$(CONFIG_INTEGRITY)                        += integrity/
--
2.27.0

--

2 more quoted lines



-- 
Best Regards
Masahiro Yamada
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help