[2/5] integrity: remove pointless subdir-$(CONFIG_...)

Message ID 20190726021058.4212-3-yamada.masahiro@socionext.com
State Accepted
Commit 7a8beb7ad51551babd17331f3c0f58af25916f67
Headers show
Series
  • security: integrity: Makefile cleanups
Related show

Commit Message

Masahiro Yamada July 26, 2019, 2:10 a.m.
The ima/ and evm/ sub-directories contain built-in objects, so
obj-$(CONFIG_...) is the correct way to descend into them.

subdir-$(CONFIG_...) is redundant.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

---

 security/integrity/Makefile | 2 --
 1 file changed, 2 deletions(-)

-- 
2.17.1

Comments

Masahiro Yamada Sept. 9, 2019, 11:44 a.m. | #1
On Fri, Jul 26, 2019 at 11:12 AM Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
>

> The ima/ and evm/ sub-directories contain built-in objects, so

> obj-$(CONFIG_...) is the correct way to descend into them.

>

> subdir-$(CONFIG_...) is redundant.

>

> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

> ---


Ping.


>

>  security/integrity/Makefile | 2 --

>  1 file changed, 2 deletions(-)

>

> diff --git a/security/integrity/Makefile b/security/integrity/Makefile

> index b6d6273a4176..35e6ca773734 100644

> --- a/security/integrity/Makefile

> +++ b/security/integrity/Makefile

> @@ -14,7 +14,5 @@ integrity-$(CONFIG_LOAD_UEFI_KEYS) += platform_certs/efi_parser.o \

>                                         platform_certs/load_uefi.o

>  integrity-$(CONFIG_LOAD_IPL_KEYS) += platform_certs/load_ipl_s390.o

>

> -subdir-$(CONFIG_IMA)                   += ima

>  obj-$(CONFIG_IMA)                      += ima/

> -subdir-$(CONFIG_EVM)                   += evm

>  obj-$(CONFIG_EVM)                      += evm/

> --

> 2.17.1

>



-- 
Best Regards
Masahiro Yamada

Patch

diff --git a/security/integrity/Makefile b/security/integrity/Makefile
index b6d6273a4176..35e6ca773734 100644
--- a/security/integrity/Makefile
+++ b/security/integrity/Makefile
@@ -14,7 +14,5 @@  integrity-$(CONFIG_LOAD_UEFI_KEYS) += platform_certs/efi_parser.o \
 					platform_certs/load_uefi.o
 integrity-$(CONFIG_LOAD_IPL_KEYS) += platform_certs/load_ipl_s390.o
 
-subdir-$(CONFIG_IMA)			+= ima
 obj-$(CONFIG_IMA)			+= ima/
-subdir-$(CONFIG_EVM)			+= evm
 obj-$(CONFIG_EVM)			+= evm/