diff options
author | Michal Marek <mmarek@suse.cz> | 2010-03-08 04:26:22 -0500 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2010-03-08 04:26:22 -0500 |
commit | e93bc1a0cab3e54e3c1947e01c8e73892e35630d (patch) | |
tree | f7b40bb868ad3a4e1895a5a0cca82a5c08300c2a /scripts | |
parent | a6c366324cacd5f71107dd01362b995a1c67b1ad (diff) |
Revert "kbuild: specify absolute paths for cscope"
This reverts commit eb8f844c0a41c4529a7d06b7801296eca9ae67aa. Ian
Campbell writes:
> I keep my kernel source tree on a more powerful build box where I run my
> builds etc (including "make cscope") but run my editor from my
> workstation with an NFS mount to the source. This worked fine for me
> using relative paths for cscope. Using absolute paths in cscope breaks
> this previously working setup because the root path is not the same on
> both systems. I guess this is similar to moving the source tree around.
>
> Without wanting to start a flamewar it really sounds to me like we are
> working around a vim (or cscope) bug here, emacs with cscope bindings
> works fine in this configuration.
Given that absolute paths can be forced by make O=. cscope, change the
default back to relative paths.
Ian Campbell <ijc@hellion.org.uk>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/tags.sh | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/scripts/tags.sh b/scripts/tags.sh index 868b4c8fc25f..8509bb512935 100755 --- a/scripts/tags.sh +++ b/scripts/tags.sh | |||
@@ -18,6 +18,8 @@ ignore="( -name SCCS -o -name BitKeeper -o -name .svn -o \ | |||
18 | -prune -o" | 18 | -prune -o" |
19 | 19 | ||
20 | # Do not use full path if we do not use O=.. builds | 20 | # Do not use full path if we do not use O=.. builds |
21 | # Use make O=. {tags|cscope} | ||
22 | # to force full paths for a non-O= build | ||
21 | if [ "${KBUILD_SRC}" = "" ]; then | 23 | if [ "${KBUILD_SRC}" = "" ]; then |
22 | tree= | 24 | tree= |
23 | else | 25 | else |
@@ -108,13 +110,7 @@ all_defconfigs() | |||
108 | 110 | ||
109 | docscope() | 111 | docscope() |
110 | { | 112 | { |
111 | # always use absolute paths for cscope, as recommended by cscope | 113 | (echo \-k; echo \-q; all_sources) > cscope.files |
112 | # upstream | ||
113 | case "$tree" in | ||
114 | /*) ;; | ||
115 | *) tree=$PWD/$tree ;; | ||
116 | esac | ||
117 | (cd /; echo \-k; echo \-q; all_sources) > cscope.files | ||
118 | cscope -b -f cscope.out | 114 | cscope -b -f cscope.out |
119 | } | 115 | } |
120 | 116 | ||