2019-01-25 03:42:24

by Masahiro Yamada

Subject: [PATCH] libfdt: prefix header search paths with $(srctree)/

Currently, the Kbuild core manipulates header search paths in a crazy
way [1].

To fix this mess, I want all Makefiles to add explicit $(srctree)/ to
the search paths in the srctree. Some Makefiles are already written in
that way, but not all. The goal of this work is to make the notation
consistent, and finally get rid of the gross hacks.

Having whitespaces after -I does not matter since commit 48f6e3cf5bc6
("kbuild: do not drop -I without parameter").

[1]: https://patchwork.kernel.org/patch/9632347/

Signed-off-by: Masahiro Yamada <[email protected]>
---

lib/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Makefile b/lib/Makefile
index e1b59da..05973c1 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -208,7 +208,7 @@ KCOV_INSTRUMENT_stackdepot.o := n
libfdt_files = fdt.o fdt_ro.o fdt_wip.o fdt_rw.o fdt_sw.o fdt_strerror.o \
fdt_empty_tree.o
$(foreach file, $(libfdt_files), \
- $(eval CFLAGS_$(file) = -I$(src)/../scripts/dtc/libfdt))
+ $(eval CFLAGS_$(file) = -I $(srctree)/scripts/dtc/libfdt))
lib-$(CONFIG_LIBFDT) += $(libfdt_files)

obj-$(CONFIG_RBTREE_TEST) += rbtree_test.o
--
2.7.4

2019-02-11 01:44:06

by Masahiro Yamada

Subject: Re: [PATCH] libfdt: prefix header search paths with $(srctree)/

Hi Rob,


On Fri, Jan 25, 2019 at 12:42 PM Masahiro Yamada
<[email protected]> wrote:
>
> Currently, the Kbuild core manipulates header search paths in a crazy
> way [1].
>
> To fix this mess, I want all Makefiles to add explicit $(srctree)/ to
> the search paths in the srctree. Some Makefiles are already written in
> that way, but not all. The goal of this work is to make the notation
> consistent, and finally get rid of the gross hacks.
>
> Having whitespaces after -I does not matter since commit 48f6e3cf5bc6
> ("kbuild: do not drop -I without parameter").
>
> [1]: https://patchwork.kernel.org/patch/9632347/
>
> Signed-off-by: Masahiro Yamada <[email protected]>


Could you apply this to your tree?

Thanks.

Masahiro


> ---
>
> lib/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lib/Makefile b/lib/Makefile
> index e1b59da..05973c1 100644
> --- a/lib/Makefile
> +++ b/lib/Makefile
> @@ -208,7 +208,7 @@ KCOV_INSTRUMENT_stackdepot.o := n
> libfdt_files = fdt.o fdt_ro.o fdt_wip.o fdt_rw.o fdt_sw.o fdt_strerror.o \
> fdt_empty_tree.o
> $(foreach file, $(libfdt_files), \
> - $(eval CFLAGS_$(file) = -I$(src)/../scripts/dtc/libfdt))
> + $(eval CFLAGS_$(file) = -I $(srctree)/scripts/dtc/libfdt))
> lib-$(CONFIG_LIBFDT) += $(libfdt_files)
>
> obj-$(CONFIG_RBTREE_TEST) += rbtree_test.o
> --
> 2.7.4
>


--
Best Regards
Masahiro Yamada

2019-03-13 17:37:22

by Masahiro Yamada

Subject: Re: [PATCH] libfdt: prefix header search paths with $(srctree)/

On Mon, Feb 11, 2019 at 10:43 AM Masahiro Yamada
<[email protected]> wrote:
>
> Hi Rob,
>
>
> On Fri, Jan 25, 2019 at 12:42 PM Masahiro Yamada
> <[email protected]> wrote:
> >
> > Currently, the Kbuild core manipulates header search paths in a crazy
> > way [1].
> >
> > To fix this mess, I want all Makefiles to add explicit $(srctree)/ to
> > the search paths in the srctree. Some Makefiles are already written in
> > that way, but not all. The goal of this work is to make the notation
> > consistent, and finally get rid of the gross hacks.
> >
> > Having whitespaces after -I does not matter since commit 48f6e3cf5bc6
> > ("kbuild: do not drop -I without parameter").
> >
> > [1]: https://patchwork.kernel.org/patch/9632347/
> >
> > Signed-off-by: Masahiro Yamada <[email protected]>
>
>
> Could you apply this to your tree?


Anyway, this one is trivial Makefile change.

Applied to linux-kbuild now.





> Thanks.
>
> Masahiro
>
>
> > ---
> >
> > lib/Makefile | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/lib/Makefile b/lib/Makefile
> > index e1b59da..05973c1 100644
> > --- a/lib/Makefile
> > +++ b/lib/Makefile
> > @@ -208,7 +208,7 @@ KCOV_INSTRUMENT_stackdepot.o := n
> > libfdt_files = fdt.o fdt_ro.o fdt_wip.o fdt_rw.o fdt_sw.o fdt_strerror.o \
> > fdt_empty_tree.o
> > $(foreach file, $(libfdt_files), \
> > - $(eval CFLAGS_$(file) = -I$(src)/../scripts/dtc/libfdt))
> > + $(eval CFLAGS_$(file) = -I $(srctree)/scripts/dtc/libfdt))
> > lib-$(CONFIG_LIBFDT) += $(libfdt_files)
> >
> > obj-$(CONFIG_RBTREE_TEST) += rbtree_test.o
> > --
> > 2.7.4
> >
>
>
> --
> Best Regards
> Masahiro Yamada



--
Best Regards
Masahiro Yamada

2019-03-13 18:15:40

by Rob Herring

Subject: Re: [PATCH] libfdt: prefix header search paths with $(srctree)/

On Wed, Mar 13, 2019 at 12:36 PM Masahiro Yamada
<[email protected]> wrote:
>
> On Mon, Feb 11, 2019 at 10:43 AM Masahiro Yamada
> <[email protected]> wrote:
> >
> > Hi Rob,
> >
> >
> > On Fri, Jan 25, 2019 at 12:42 PM Masahiro Yamada
> > <[email protected]> wrote:
> > >
> > > Currently, the Kbuild core manipulates header search paths in a crazy
> > > way [1].
> > >
> > > To fix this mess, I want all Makefiles to add explicit $(srctree)/ to
> > > the search paths in the srctree. Some Makefiles are already written in
> > > that way, but not all. The goal of this work is to make the notation
> > > consistent, and finally get rid of the gross hacks.
> > >
> > > Having whitespaces after -I does not matter since commit 48f6e3cf5bc6
> > > ("kbuild: do not drop -I without parameter").
> > >
> > > [1]: https://patchwork.kernel.org/patch/9632347/
> > >
> > > Signed-off-by: Masahiro Yamada <[email protected]>
> >
> >
> > Could you apply this to your tree?
>
>
> Anyway, this one is trivial Makefile change.
>
> Applied to linux-kbuild now.

Sorry, I missed this. It tends to happen with things outside my normal
search path.

Rob