Skip to contentSkip to conversation

kbuild: fix errors of 'make *tags' and 'make cscope'

PATCH Superseded Masahiro Yamada 2 participants 3 messages Feb 21, 2014 Kbuild

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kbuild: fix errors of 'make *tags' and 'make cscope'

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +1 -1
index b91381c..a06abec 100644
@@ -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
 
 config-targets := 0
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 1/1 kbuild: fix errors of 'make *tags' and 'make cscope'

Masahiro-san,

Quoted 11 lines · Masahiro Yamada
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Makefile +0 -0
index b91381c..a06abec 100644

Makefile version_h := include/generated/version_autogenerated.h · line 418

Quoted 6 lines
Makefile +1 -1
@@ -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@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?

Makefile +1 -1
index d9b2b7f..a314a11 100644
@@ -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
Signature · 2 lines
Regards,
Nishanth Menon
#2 lore raw

PATCH 1/1 kbuild: fix errors of 'make *tags' and 'make cscope'

Hello Nishanth,

Quoted 10 lines

Makefile version_h := include/generated/version_autogenerated.h · line 418

Quoted 9 lines
Makefile +1 -1
@@ -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

Oops, sorry again.

I have posted version2.

Best Regards
Masahiro Yamada