mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH] kbuild: Add missing semicolon
@ 2019-02-14  8:20 Sascha Hauer
  2019-02-15  1:53 ` Masahiro Yamada
  0 siblings, 1 reply; 2+ messages in thread
From: Sascha Hauer @ 2019-02-14  8:20 UTC (permalink / raw)
  To: Barebox List

Fixes: 4fafb35d925e5 ("kbuild: cherry-pick changes from Linux v5.0-rc3")

The change cherry-picked from the Kernel commit 7d0ea2524202 ("kbuild: use
'else ifeq' for checksrc to improve readability") also removed the
trailing semicolons from the cmd_*checksrc lines. These were removed in
kernel commit e5d289100d ("kbuild: remove trailing semicolon from cmd_*
passed to if_changed_rule"), but seems the barebox Kbuild version is not
yet ready for this change. Without the semicolons a make C=1 build fails
with:

No such file: echo

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
---
 scripts/Makefile.build | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 2c45ea872f..db687d5f9e 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -86,10 +86,10 @@ __build: $(if $(KBUILD_BUILTIN),$(builtin-target) $(lib-target) $(pbl-target) $(
 # Linus' kernel sanity checking tool
 ifeq ($(KBUILD_CHECKSRC),1)
   quiet_cmd_checksrc       = CHECK   $<
-        cmd_checksrc       = $(CHECK) $(CHECKFLAGS) $(c_flags) $<
+        cmd_checksrc       = $(CHECK) $(CHECKFLAGS) $(c_flags) $< ;
 else ifeq ($(KBUILD_CHECKSRC),2)
   quiet_cmd_force_checksrc = CHECK   $<
-        cmd_force_checksrc = $(CHECK) $(CHECKFLAGS) $(c_flags) $<
+        cmd_force_checksrc = $(CHECK) $(CHECKFLAGS) $(c_flags) $< ;
 endif
 
 # Compile C sources (.c)
-- 
2.20.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] kbuild: Add missing semicolon
  2019-02-14  8:20 [PATCH] kbuild: Add missing semicolon Sascha Hauer
@ 2019-02-15  1:53 ` Masahiro Yamada
  0 siblings, 0 replies; 2+ messages in thread
From: Masahiro Yamada @ 2019-02-15  1:53 UTC (permalink / raw)
  To: Sascha Hauer; +Cc: Barebox List

On Thu, Feb 14, 2019 at 5:20 PM Sascha Hauer <s.hauer@pengutronix.de> wrote:
>
> Fixes: 4fafb35d925e5 ("kbuild: cherry-pick changes from Linux v5.0-rc3")
>
> The change cherry-picked from the Kernel commit 7d0ea2524202 ("kbuild: use
> 'else ifeq' for checksrc to improve readability") also removed the
> trailing semicolons from the cmd_*checksrc lines. These were removed in
> kernel commit e5d289100d ("kbuild: remove trailing semicolon from cmd_*
> passed to if_changed_rule"), but seems the barebox Kbuild version is not
> yet ready for this change. Without the semicolons a make C=1 build fails
> with:
>
> No such file: echo


My bad - this change accidentally slipped in.

It would be possible to sync if_changed* with latest Linux,
but I agree that we should revert the offending lines for now.


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



>
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> Cc: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---
>  scripts/Makefile.build | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/scripts/Makefile.build b/scripts/Makefile.build
> index 2c45ea872f..db687d5f9e 100644
> --- a/scripts/Makefile.build
> +++ b/scripts/Makefile.build
> @@ -86,10 +86,10 @@ __build: $(if $(KBUILD_BUILTIN),$(builtin-target) $(lib-target) $(pbl-target) $(
>  # Linus' kernel sanity checking tool
>  ifeq ($(KBUILD_CHECKSRC),1)
>    quiet_cmd_checksrc       = CHECK   $<
> -        cmd_checksrc       = $(CHECK) $(CHECKFLAGS) $(c_flags) $<
> +        cmd_checksrc       = $(CHECK) $(CHECKFLAGS) $(c_flags) $< ;
>  else ifeq ($(KBUILD_CHECKSRC),2)
>    quiet_cmd_force_checksrc = CHECK   $<
> -        cmd_force_checksrc = $(CHECK) $(CHECKFLAGS) $(c_flags) $<
> +        cmd_force_checksrc = $(CHECK) $(CHECKFLAGS) $(c_flags) $< ;
>  endif
>
>  # Compile C sources (.c)
> --
> 2.20.1
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox



-- 
Best Regards
Masahiro Yamada

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-02-15  1:54 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-14  8:20 [PATCH] kbuild: Add missing semicolon Sascha Hauer
2019-02-15  1:53 ` Masahiro Yamada

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox