[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-892-g8b4d9503d

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  8b4d9503d866bd7f70f743c3422076ba9ac9d58f (commit)
       via  b0c36e0457446b76b32ca13db3e51f66b540d159 (commit)
      from  7d1e08456c785eb7e5497cf7d66296c8f16736a5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 8b4d9503d866bd7f70f743c3422076ba9ac9d58f
Author: Antonio Borneo <bor...@gm...>
Date:   Sun Apr 26 16:03:45 2020 +0200

    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 <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/5608
    Tested-by: jenkins

diff --git a/.checkpatch.conf b/.checkpatch.conf
index c6e4bbef0..9d2084659 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 9ef94ff43..3c656973a 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 18cb9f5b3..f88294379 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()

commit b0c36e0457446b76b32ca13db3e51f66b540d159
Author: Antonio Borneo <bor...@gm...>
Date:   Mon May 6 10:24:52 2019 +0200

    checkpatch: add list of typedef used in OpenOCD
    
    The new checkpatch from Linux kernel does not recognizes the
    specific types used in OpenOCD, e.g. "fd_set" and "Jim_Obj".
    As consequence, it consider "fd_set" as the name of a variable,
    then misinterpret the asterisk for the pointer "fd_set *" as a
    multiplication, thus suggest to add a space after the asterisk
    and replace "fd_set *x" with "fd_set * x".
    
    Let checkpatch recognize the typedef used in OpenOCD.
    
    Change-Id: Ibc295e6a8b47ffa88b50a6d510b7970760e5199d
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/5607
    Tested-by: jenkins

diff --git a/.checkpatch.conf b/.checkpatch.conf
index 1ab743e2c..c6e4bbef0 100644
--- a/.checkpatch.conf
+++ b/.checkpatch.conf
@@ -5,6 +5,8 @@
 --show-types
 --strict
 
+--typedefsfile tools/scripts/typedefs.txt
+
 --ignore AVOID_EXTERNS
 --ignore BLOCK_COMMENT_STYLE
 --ignore CAMELCASE
diff --git a/tools/scripts/typedefs.txt b/tools/scripts/typedefs.txt
new file mode 100644
index 000000000..97f330d9d
--- /dev/null
+++ b/tools/scripts/typedefs.txt
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+fd_set
+Jim_Cmd
+Jim_CmdProc
+Jim_DelCmdProc
+Jim_Interp
+Jim_Obj

-----------------------------------------------------------------------

Summary of changes:
 .checkpatch.conf            |  3 ++-
 tools/scripts/checkpatch.pl | 10 ++++++++--
 tools/scripts/spdxcheck.py  |  4 +++-
 tools/scripts/typedefs.txt  |  8 ++++++++
 4 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 tools/scripts/typedefs.txt


hooks/post-receive
-- 
Main OpenOCD repository