diff options
| -rw-r--r-- | .checkpatch.conf | 1 | ||||
| -rwxr-xr-x | tools/scripts/checkpatch.pl | 10 | ||||
| -rwxr-xr-x | tools/scripts/spdxcheck.py | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/.checkpatch.conf b/.checkpatch.conf index c6e4bbe..9d20846 100644 --- a/.checkpatch.conf +++ b/.checkpatch.conf @@ -23,7 +23,6 @@ --ignore PREFER_DEFINED_ATTRIBUTE_MACRO --ignore PREFER_FALLTHROUGH --ignore PREFER_KERNEL_TYPES ---ignore SPDX_LICENSE_TAG --ignore SPLIT_STRING --ignore SSCANF_TO_KSTRTO --ignore SWITCH_CASE_INDENT_LEVEL diff --git a/tools/scripts/checkpatch.pl b/tools/scripts/checkpatch.pl index 9ef94ff..3c65697 100755 --- a/tools/scripts/checkpatch.pl +++ b/tools/scripts/checkpatch.pl @@ -1132,10 +1132,12 @@ sub is_maintained_obsolete { sub is_SPDX_License_valid { my ($license) = @_; - return 1 if (!$tree || which("python3") eq "" || !(-x "$root/scripts/spdxcheck.py") || !(-e "$gitroot")); + # OpenOCD specific: Begin: replace s"scripts"tools/scripts" + return 1 if (!$tree || which("python3") eq "" || !(-x "$root/tools/scripts/spdxcheck.py") || !(-e "$gitroot")); my $root_path = abs_path($root); - my $status = `cd "$root_path"; echo "$license" | scripts/spdxcheck.py -`; + my $status = `cd "$root_path"; echo "$license" | tools/scripts/spdxcheck.py -`; + # OpenOCD specific: End return 0 if ($status ne ""); return 1; } @@ -3669,6 +3671,10 @@ sub process { $comment = '#'; } elsif ($realfile =~ /\.rst$/) { $comment = '..'; + # OpenOCD specific: Begin + } elsif ($realfile =~ /\.(am|cfg|tcl)$/) { + $comment = '#'; + # OpenOCD specific: End } # check SPDX comment style for .[chsS] files diff --git a/tools/scripts/spdxcheck.py b/tools/scripts/spdxcheck.py index 18cb9f5..f882943 100755 --- a/tools/scripts/spdxcheck.py +++ b/tools/scripts/spdxcheck.py @@ -49,7 +49,9 @@ def read_spdxdata(repo): # The subdirectories of LICENSES in the kernel source # Note: exceptions needs to be parsed as last directory. - license_dirs = [ "preferred", "dual", "deprecated", "exceptions" ] + # OpenOCD specific: Begin + license_dirs = [ "preferred", "stand-alone", "exceptions" ] + # OpenOCD specific: End lictree = repo.head.commit.tree['LICENSES'] spdx = SPDXdata() |