]> git.baikalelectronics.ru Git - kernel.git/commitdiff
scripts/tags.sh: Include tools directory in tags generation
authorVipin Sharma <vipinsh@google.com>
Sat, 18 Jun 2022 00:54:57 +0000 (17:54 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 1 Jul 2022 08:32:30 +0000 (10:32 +0200)
Add tools directory in generating tags and quiet the "No such file or
directory" warnings.

It reverts the changes introduced in commit a19d9998ac6e
("scripts/tags.sh: exclude tools directory from tags generation") while
maintainig the original intent of the patch to get rid of the warnings.
This allows the root level cscope files to include tools source code
besides kernel and a single place to browse the code for both.

Acked-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Signed-off-by: Vipin Sharma <vipinsh@google.com>
Link: https://lore.kernel.org/r/20220618005457.2379324-1-vipinsh@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
scripts/tags.sh

index 01fab3d4f90b5f04b62238ebcb72c358e1f55105..e137cf15aae9d778542b10b62fad4e3d6d499ca1 100755 (executable)
@@ -25,13 +25,6 @@ else
        tree=${srctree}/
 fi
 
-# ignore userspace tools
-if [ -n "$COMPILED_SOURCE" ]; then
-       ignore="$ignore ( -path ./tools ) -prune -o"
-else
-       ignore="$ignore ( -path ${tree}tools ) -prune -o"
-fi
-
 # Detect if ALLSOURCE_ARCHS is set. If not, we assume SRCARCH
 if [ "${ALLSOURCE_ARCHS}" = "" ]; then
        ALLSOURCE_ARCHS=${SRCARCH}
@@ -100,7 +93,7 @@ all_compiled_sources()
                find $ignore -name "*.cmd" -exec \
                        grep -Poh '(?(?=^source_.* \K).*|(?=^  \K\S).*(?= \\))' {} \+ |
                awk '!a[$0]++'
-       } | xargs realpath -es $([ -z "$KBUILD_ABS_SRCTREE" ] && echo --relative-to=.) |
+       } | xargs realpath -esq $([ -z "$KBUILD_ABS_SRCTREE" ] && echo --relative-to=.) |
        sort -u
 }