interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

checkpatch: check for SPDX tags of licenses in use 

Fix the patch of the external helper spdxcheck.py accordingly to
OpenOCD folder structure.
List only the current LICENSES subfolders in spdxcheck.py .
Enable the check for SPDX headers.
Extend the check for TCL and Makefile.am files.

Change-Id: I0a40da0127746217ee0ac416058d5ceb922428ff
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: https://review.openocd.org/c/openocd/+/5608
Tested-by: jenkins
This commit is contained in:
Antonio Borneo 2020-04-26 16:03:45 +02:00
parent b0c36e0457
commit 8b4d9503d8
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.checkpatch.conf
View File

@ -23,7 +23,6 @@
--ignore PREFER_DEFINED_ATTRIBUTE_MACRO --ignore PREFER_DEFINED_ATTRIBUTE_MACRO
--ignore PREFER_FALLTHROUGH --ignore PREFER_FALLTHROUGH
--ignore PREFER_KERNEL_TYPES --ignore PREFER_KERNEL_TYPES
--ignore SPDX_LICENSE_TAG
--ignore SPLIT_STRING --ignore SPLIT_STRING
--ignore SSCANF_TO_KSTRTO --ignore SSCANF_TO_KSTRTO
--ignore SWITCH_CASE_INDENT_LEVEL --ignore SWITCH_CASE_INDENT_LEVEL

10
tools/scripts/checkpatch.pl
View File

@ -1132,10 +1132,12 @@ sub is_maintained_obsolete {
sub is_SPDX_License_valid { sub is_SPDX_License_valid {
my ($license) = @_; 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 $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 0 if ($status ne "");
return 1; return 1;
} }
@ -3669,6 +3671,10 @@ sub process {
$comment = '#'; $comment = '#';
} elsif ($realfile =~ /\.rst$/) { } elsif ($realfile =~ /\.rst$/) {
$comment = '..'; $comment = '..';
# OpenOCD specific: Begin
} elsif ($realfile =~ /\.(am|cfg|tcl)$/) {
$comment = '#';
# OpenOCD specific: End
} }
# check SPDX comment style for .[chsS] files # check SPDX comment style for .[chsS] files

4
tools/scripts/spdxcheck.py
View File

@ -49,7 +49,9 @@ def read_spdxdata(repo):
# The subdirectories of LICENSES in the kernel source # The subdirectories of LICENSES in the kernel source
# Note: exceptions needs to be parsed as last directory. # 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'] lictree = repo.head.commit.tree['LICENSES']
spdx = SPDXdata() spdx = SPDXdata()