2018-08-02 13:49:28

by Dirk Gouders

[permalink] [raw]
Subject: [PATCH] Kbuild: Makefile.modbuiltin: include auto.conf and tristate.conf mandatory

The files auto.conf and tristate.conf are mandatory for building
modules.builtin files, therefore include them as such.

Usually, the top-level Makefile ensures that those files exist but we
want to make sure we get noticed if they are missing for whatever
reason.

Signed-off-by: Dirk Gouders <[email protected]>
---
scripts/Makefile.modbuiltin | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/Makefile.modbuiltin b/scripts/Makefile.modbuiltin
index 40867a41615b..a072a4267746 100644
--- a/scripts/Makefile.modbuiltin
+++ b/scripts/Makefile.modbuiltin
@@ -8,10 +8,10 @@ src := $(obj)
PHONY := __modbuiltin
__modbuiltin:

--include include/config/auto.conf
+include include/config/auto.conf
# tristate.conf sets tristate variables to uppercase 'Y' or 'M'
# That way, we get the list of built-in modules in obj-Y
--include include/config/tristate.conf
+include include/config/tristate.conf

include scripts/Kbuild.include

--
2.16.4



2018-08-02 15:50:51

by Masahiro Yamada

[permalink] [raw]
Subject: Re: [PATCH] Kbuild: Makefile.modbuiltin: include auto.conf and tristate.conf mandatory

2018-08-02 22:47 GMT+09:00 Dirk Gouders <[email protected]>:
> The files auto.conf and tristate.conf are mandatory for building
> modules.builtin files, therefore include them as such.
>
> Usually, the top-level Makefile ensures that those files exist but we
> want to make sure we get noticed if they are missing for whatever
> reason.
>
> Signed-off-by: Dirk Gouders <[email protected]>
> ---

Applied. Thanks!

> scripts/Makefile.modbuiltin | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/Makefile.modbuiltin b/scripts/Makefile.modbuiltin
> index 40867a41615b..a072a4267746 100644
> --- a/scripts/Makefile.modbuiltin
> +++ b/scripts/Makefile.modbuiltin
> @@ -8,10 +8,10 @@ src := $(obj)
> PHONY := __modbuiltin
> __modbuiltin:
>
> --include include/config/auto.conf
> +include include/config/auto.conf
> # tristate.conf sets tristate variables to uppercase 'Y' or 'M'
> # That way, we get the list of built-in modules in obj-Y
> --include include/config/tristate.conf
> +include include/config/tristate.conf
>
> include scripts/Kbuild.include
>
> --
> 2.16.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html



--
Best Regards
Masahiro Yamada