Commit e93bc1a0cab3e54e3c1947e01c8e73892e35630d

Authored by Michal Marek
1 parent a6c366324c

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>

Showing 1 changed file with 3 additions and 7 deletions Side-by-side Diff

... ... @@ -18,6 +18,8 @@
18 18 -prune -o"
19 19  
20 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 23 if [ "${KBUILD_SRC}" = "" ]; then
22 24 tree=
23 25 else
... ... @@ -108,13 +110,7 @@
108 110  
109 111 docscope()
110 112 {
111   - # always use absolute paths for cscope, as recommended by cscope
112   - # upstream
113   - case "$tree" in
114   - /*) ;;
115   - *) tree=$PWD/$tree ;;
116   - esac
117   - (cd /; echo \-k; echo \-q; all_sources) > cscope.files
  113 + (echo \-k; echo \-q; all_sources) > cscope.files
118 114 cscope -b -f cscope.out
119 115 }
120 116