| Message ID | 1533694454-7086-1-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | 3fca1700c4c38aaec1cea0c143b0ff8da029fd9c |
| Headers | show |
| Series | [v2] kbuild: make samples really depend on headers_install | expand |
2018-08-08 11:14 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>: > Kernel headers must be installed into $(objtree)/usr/include to avoid > the build failure of samples. > > Commit ddea05fa148b ("kbuild: make samples depend on headers_install") > addressed this, but "samples/" is only used for the single target build. > > "make samples/" properly installs kernel headers, but it does not work > for general building because a phony target "sample" (no trailing slash) > is used. > > Reported-by: David Howells <dhowells@redhat.com> > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> > --- David, Could you check this patch, please? Will you apply this to your tree to fix the vfs sample issue? Please let me know your thought. Thanks. > Changes in v2: > - Correct commit log (backslash -> slash) > - Fix a typo > > Makefile | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index 7a3c454..1e47d13 100644 > --- a/Makefile > +++ b/Makefile > @@ -1009,9 +1009,10 @@ ifdef CONFIG_GDB_SCRIPTS > endif > +$(call if_changed,link-vmlinux) > > -# Build samples along the rest of the kernel > +# Build samples along the rest of the kernel. This needs headers_install. > ifdef CONFIG_SAMPLES > vmlinux-dirs += samples > +samples: headers_install > endif > > # The actual objects are generated when descending, > -- > 2.7.4 > > -- > 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 -- Best Regards Masahiro Yamada
Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > Could you check this patch, please? That seems to work. Tested-by: David Howells <dhowells@redhat.com>
diff --git a/Makefile b/Makefile index 7a3c454..1e47d13 100644 --- a/Makefile +++ b/Makefile @@ -1009,9 +1009,10 @@ ifdef CONFIG_GDB_SCRIPTS endif +$(call if_changed,link-vmlinux) -# Build samples along the rest of the kernel +# Build samples along the rest of the kernel. This needs headers_install. ifdef CONFIG_SAMPLES vmlinux-dirs += samples +samples: headers_install endif # The actual objects are generated when descending,
Kernel headers must be installed into $(objtree)/usr/include to avoid the build failure of samples. Commit ddea05fa148b ("kbuild: make samples depend on headers_install") addressed this, but "samples/" is only used for the single target build. "make samples/" properly installs kernel headers, but it does not work for general building because a phony target "sample" (no trailing slash) is used. Reported-by: David Howells <dhowells@redhat.com> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- Changes in v2: - Correct commit log (backslash -> slash) - Fix a typo Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.7.4