scripts/tags.sh: fix direct execution of scripts/tags.sh
diff mbox series

Message ID 1556510803-5628-1-git-send-email-yamada.masahiro@socionext.com
State New
Headers show
Series
  • scripts/tags.sh: fix direct execution of scripts/tags.sh
Related show

Commit Message

Masahiro Yamada April 29, 2019, 4:06 a.m. UTC
I thought this script was run via "make tags" etc. but some people
run it directly.

Prior to commit a9a49c2ad9b9 ("kbuild: use $(srctree) instead of
KBUILD_SRC to check out-of-tree build"), in such a usecase, "tree"
was set empty since KBUILD_SRC is undefined. Now, "tree" is set to
"${srctree}/", which is evaluated to "/".

Fix it by taking into account the case where "srctree" is unset.

Link: https://lkml.org/lkml/2019/4/19/501
Fixes: a9a49c2ad9b9 ("kbuild: use $(srctree) instead of KBUILD_SRC to check out-of-tree build")
Reported-by: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

 scripts/tags.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Masahiro Yamada May 1, 2019, 12:39 p.m. UTC | #1
On Mon, Apr 29, 2019 at 1:07 PM Masahiro Yamada
<yamada.masahiro@socionext.com> wrote:
>
> I thought this script was run via "make tags" etc. but some people
> run it directly.
>
> Prior to commit a9a49c2ad9b9 ("kbuild: use $(srctree) instead of
> KBUILD_SRC to check out-of-tree build"), in such a usecase, "tree"
> was set empty since KBUILD_SRC is undefined. Now, "tree" is set to
> "${srctree}/", which is evaluated to "/".
>
> Fix it by taking into account the case where "srctree" is unset.
>
> Link: https://lkml.org/lkml/2019/4/19/501
> Fixes: a9a49c2ad9b9 ("kbuild: use $(srctree) instead of KBUILD_SRC to check out-of-tree build")
> Reported-by: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
> ---

Applied to linux-kbuild.


>
>  scripts/tags.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/tags.sh b/scripts/tags.sh
> index 6a55180..70e14c6 100755
> --- a/scripts/tags.sh
> +++ b/scripts/tags.sh
> @@ -19,7 +19,7 @@ ignore="$ignore ( -name *.mod.c ) -prune -o"
>  # Do not use full path if we do not use O=.. builds
>  # Use make O=. {tags|cscope}
>  # to force full paths for a non-O= build
> -if [ "${srctree}" = "." ]; then
> +if [ "${srctree}" = "." -o -z "${srctree}" ]; then
>         tree=
>  else
>         tree=${srctree}/
> --
> 2.7.4
>

Patch
diff mbox series

diff --git a/scripts/tags.sh b/scripts/tags.sh
index 6a55180..70e14c6 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -19,7 +19,7 @@  ignore="$ignore ( -name *.mod.c ) -prune -o"
 # Do not use full path if we do not use O=.. builds
 # Use make O=. {tags|cscope}
 # to force full paths for a non-O= build
-if [ "${srctree}" = "." ]; then
+if [ "${srctree}" = "." -o -z "${srctree}" ]; then
 	tree=
 else
 	tree=${srctree}/