scripts/tags.sh: Fix obsolete parameter for ctags
authorPhilip K. Gisslow <ripxorip@gmail.com>
Sun, 5 Sep 2021 07:31:32 +0000 (09:31 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 14 Sep 2021 09:23:49 +0000 (11:23 +0200)
Distros such as Fedora and Arch are using the maintained
universal-ctags implementation. This version has replaced
the obsolete --extra flag with --extras.

Signed-off-by: Philip K. Gisslow <ripxorip@gmail.com>
Link: https://lore.kernel.org/r/20210905073133.21910-1-ripxorip@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
scripts/tags.sh

index db8ba411860a5db23d1c2a62b488658d32576248..b24bfaec6290adb8312b5f33121005df41566f87 100755 (executable)
@@ -247,6 +247,10 @@ setup_regex()
 
 exuberant()
 {
+       CTAGS_EXTRA="extra"
+       if $1 --version 2>&1 | grep -iq universal; then
+           CTAGS_EXTRA="extras"
+       fi
        setup_regex exuberant asm c
        all_target_sources | xargs $1 -a                        \
        -I __initdata,__exitdata,__initconst,__ro_after_init    \
@@ -261,7 +265,7 @@ exuberant()
        -I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL,ACPI_EXPORT_SYMBOL   \
        -I DEFINE_TRACE,EXPORT_TRACEPOINT_SYMBOL,EXPORT_TRACEPOINT_SYMBOL_GPL \
        -I static,const                                         \
-       --extra=+fq --c-kinds=+px --fields=+iaS --langmap=c:+.h \
+       --$CTAGS_EXTRA=+fq --c-kinds=+px --fields=+iaS --langmap=c:+.h \
        "${regex[@]}"
 
        setup_regex exuberant kconfig