On Thu, 2018-02-01 at 15:14 -0600, Rob Herring wrote:
> Add SPDX license tag check based on the rules defined in
> Documentation/process/license-rules.rst. To summarize, SPDX license tags
> should be on the 1st line (or 2nd line in scripts) using the appropriate
> comment style for the file type.
> 
> Cc: Andy Whitcroft <[email protected]>
> Cc: Joe Perches <[email protected]>
> Cc: Greg Kroah-Hartman <[email protected]>
> Cc: Thomas Gleixner <[email protected]>
> Cc: Philippe Ombredanne <[email protected]>
> Cc: Andrew Morton <[email protected]>
> Signed-off-by: Rob Herring <[email protected]>
> ---
> I didn't get around to resending once license-rules.rst landed in -next. 
> Hopefully, this can be picked up for 4.16 so folks can start using it. 
> SPDX tags have already become a frequent review comment.

Seems sensible enough now.
Here are some other suggestions.

> diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
[]
> @@ -2866,6 +2869,30 @@ sub process {
>                       }
>               }
>  
> +# check for using SPDX license tag at beginning of files
> +             if ($realline == $checklicenseline) {
> +                     if ($realfile =~ /\.(?:sh|pl|py)/ && $rawline =~ /\[ 
> \+]\s*\!\#/) {

There are many files with a #! shebang that do
not use these filename types.

$ git grep -P --name-only '^\s*\#\!\s*/(?:bin|usr)' | \
  grep -vP
"(?:txt|rst|py|sh|pl)$" | wc -l
158

i.e.: .tc and .awk files and ~100 files without extensions

So I would add awk and tc to the $realfile test and
perhaps extend this check to test if the file is not
binary and executable.

> +                             $checklicenseline = 2;
> +                     } elsif ($rawline =~ /^\+/) {
> +                             my $comment = "";
> +                             if ($realfile =~ /\.(h|s|S)$/) {
> +                                     $comment = '/*';
> +                             } elsif ($realfile =~ /\.(c|dts|dtsi)$/) {
> +                                     $comment = '//';
> +                             } elsif ($realfile =~ /\.(sh|pl|py)$/) {
> +                                     $comment = '#';
> +                             } elsif ($realfile =~ /\.rst$/) {
> +                                     $comment = '..';
> +                             }
> +
> +                             if ($comment !~ /^$/ &&
> +                                 $rawline !~ /^\+\Q$comment\E 
> SPDX-License-Identifier: /) {
> +                                     WARN("SPDX_LICENSE_TAG",
> +                                          "Missing or malformed 
> SPDX-License-Identifier tag in 1st (or 2nd for scripts) line\n" . $herecurr);

Perhaps 'Missing ... in line $checklicense\n"

Reply via email to