[PATCH] kbuild: do not add "selinux" to subdir- twice

[PATCH] kbuild: do not add "selinux" to subdir- twice

[Masahiro Yamada]

scripts/Makefile adds "selinux" to subdir-y or subdir- twice.

  subdir-$(CONFIG_MODVERSIONS) += genksyms
  subdir-y                     += mod
  subdir-$(CONFIG_SECURITY_SELINUX) += selinux    <--- here
  subdir-$(CONFIG_DTC)         += dtc

  # Let clean descend into subdirs
  subdir- += basic kconfig package selinux        <--- again

The latter is redundant.

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---
 scripts/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/Makefile b/scripts/Makefile
index 1d07860..890df5c 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -39,4 +39,4 @@ subdir-$(CONFIG_SECURITY_SELINUX) += selinux
 subdir-$(CONFIG_DTC)         += dtc
 
 # Let clean descend into subdirs
-subdir-	+= basic kconfig package selinux
+subdir-	+= basic kconfig package
-- 
1.8.3.2

Re: [PATCH] kbuild: do not add "selinux" to subdir- twice

[Masahiro Yamada]

Hi Michal,

Could you apply this trivial fix?
I want it included in Linux-3.15.

Best Regards
Masahiro Yamada

On Thu, 17 Apr 2014 11:47:47 +0900
Masahiro Yamada <yamada.m@jp.panasonic.com> wrote:

> scripts/Makefile adds "selinux" to subdir-y or subdir- twice.
> 
>   subdir-$(CONFIG_MODVERSIONS) += genksyms
>   subdir-y                     += mod
>   subdir-$(CONFIG_SECURITY_SELINUX) += selinux    <--- here
>   subdir-$(CONFIG_DTC)         += dtc
> 
>   # Let clean descend into subdirs
>   subdir- += basic kconfig package selinux        <--- again
> 
> The latter is redundant.
> 
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> ---
>  scripts/Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/Makefile b/scripts/Makefile
> index 1d07860..890df5c 100644
> --- a/scripts/Makefile
> +++ b/scripts/Makefile
> @@ -39,4 +39,4 @@ subdir-$(CONFIG_SECURITY_SELINUX) += selinux
>  subdir-$(CONFIG_DTC)         += dtc
>  
>  # Let clean descend into subdirs
> -subdir-	+= basic kconfig package selinux
> +subdir-	+= basic kconfig package
> -- 
> 1.8.3.2
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] kbuild: do not add "selinux" to subdir- twice

[Michal Marek]

Dne 27.5.2014 05:54, Masahiro Yamada napsal(a):
> Hi Michal,
> 
> Could you apply this trivial fix?

I added it now to kbuild.git#kbuild.


> I want it included in Linux-3.15.

I will send it for 3.16-rc1. Sorry for the delay.

Michal