[U-Boot] [PATCH] kbuild: fix errors of 'make *tags' and 'make cscope'

Nishanth Menon nm at ti.com
Fri Feb 21 05:31:00 CET 2014


Masahiro-san,

On 12:56-20140221, Masahiro Yamada wrote:
> Signed-off-by: Masahiro Yamada <yamada.m at jp.panasonic.com>
> Reported-by: Nishanth Menon <nm at ti.com>
> ---
>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Makefile b/Makefile
> index b91381c..a06abec 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -414,7 +414,7 @@ version_h := include/generated/version_autogenerated.h
>  timestamp_h := include/generated/timestamp_autogenerated.h
>  
>  no-dot-config-targets := clean clobber mrproper distclean \
> -			 cscope TAGS %tags help %docs check% coccicheck \
> +			 help %docs check% coccicheck \
>  			 ubootversion backup
^^ unfortunately, the patch fails to apply

$ git describe
v2014.04-rc1
$ wget -O a.patch http://patchwork.ozlabs.org/patch/322408/mbox/
--2014-02-20 22:24:24--  http://patchwork.ozlabs.org/patch/322408/mbox/
Length: unspecified [text/plain]
Saving to: `a.patch'

    [ <=>                                                                                                                                                                                                 ] 1,011       --.-K/s   in 0s      
$ git am a.patch
Applying: kbuild: fix errors of 'make *tags' and 'make cscope'
error: patch failed: Makefile:414
error: Makefile: patch does not apply
Patch failed at 0001 kbuild: fix errors of 'make *tags' and 'make cscope'
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".
$ git am --abort
$ patch -p1<a.patch 
patching file Makefile
Hunk #1 FAILED at 414.
1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej

The following applies and works - you might want to rebase to rc1 and
repost perhaps?
diff --git a/Makefile b/Makefile
index d9b2b7f..a314a11 100644
--- a/Makefile
+++ b/Makefile
@@ -412,7 +412,7 @@ endif
 # of make so .config is not included in this case either (for *config).
 
 no-dot-config-targets := clean clobber mrproper distclean \
-			 cscope TAGS %tags help %docs check% coccicheck \
+			 help %docs check% coccicheck \
 			 backup
 
 config-targets := 0

-- 
Regards,
Nishanth Menon


More information about the U-Boot mailing list