From: Mrinal Pandey <mrinalmni@gmail.com>
To: lukas.bulwahn@gmail.com, skhan@linuxfoundation.org,
Linux-kernel-mentees@lists.linuxfoundation.org
Subject: [Linux-kernel-mentees] [PATCH] checkpatch: Fix SPDX license check for scripts
Date: Tue, 21 Jul 2020 11:14:19 +0530 [thread overview]
Message-ID: <20200721054419.kab7i6l6zkioddh5@mrinalpandey> (raw)
[-- Attachment #1.1: Type: text/plain, Size: 2122 bytes --]
In all the scripts, the SPDX license should be on the second line,
the first line being the shebang, but checkpatch issues a warning
"Misplaced SPDX-License-Identifier tag - use line 1 instead" for the
scripts that have SPDX license in the second line.
However, this warning is not issued when checkpatch is run on a file.
The case for files has been handled gracefully by checking first line of
the file to be a shebang and then setting `$checklicenseline` to `2`but
this doesn't work when we don't have shebang in diff content of a patch
and `$checklicenseline` continues to be `1` in such cases. Therefore,
checkpatch expects the line `1` to contain the SPDX license when it
should have been `2` instead.
I noticed this false positive while running checkpatch on the set of
commits from v5.7 to v5.8-rc1 of the kernel on the commits which modified
a script file.
This false positive exists in checkpatch since commit a8da38a9cf0e
("checkpatch: add test for SPDX-License-Identifier on wrong line #")
when the corresponding rule was first commited.
Fix this by setting `$checklicenseline` to `2` whenever the file or diff
content we are checking comes from a script instead of checking first
line to be a shebang, thus, informing checkpatch that the SPDX license
should be expected on the second line.
Signed-off-by: Mrinal Pandey <mrinalmni@gmail.com>
---
scripts/checkpatch.pl | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 4c820607540b..bdd2f9a80891 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -3166,10 +3166,11 @@ sub process {
}
# check for using SPDX license tag at beginning of files
+ if ($realfile =~ /.*\.\(py\|sh\|pl\|awk\|tc\|yaml\)/) {
+ $checklicenseline = 2;
+ }
if ($realline == $checklicenseline) {
- if ($rawline =~ /^[ \+]\s*\#\!\s*\//) {
- $checklicenseline = 2;
- } elsif ($rawline =~ /^\+/) {
+ if ($rawline =~ /^\+/) {
my $comment = "";
if ($realfile =~ /\.(h|s|S)$/) {
$comment = '/*';
--
2.25.1
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 201 bytes --]
_______________________________________________
Linux-kernel-mentees mailing list
Linux-kernel-mentees@lists.linuxfoundation.org
https://lists.linuxfoundation.org/mailman/listinfo/linux-kernel-mentees
next reply other threads:[~2020-07-21 5:44 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-21 5:44 Mrinal Pandey [this message]
2020-07-22 10:20 ` [Linux-kernel-mentees] [PATCH] checkpatch: Fix SPDX license check for scripts Lukas Bulwahn
2020-07-24 7:02 ` Mrinal Pandey
2020-07-24 8:09 ` Lukas Bulwahn
-- strict thread matches above, loose matches on Subject: below --
2020-07-13 9:57 Mrinal Pandey
2020-07-13 19:46 ` Lukas Bulwahn
2020-07-14 5:35 ` Mrinal Pandey
2020-07-14 6:03 ` Lukas Bulwahn
2020-07-16 5:15 ` Mrinal Pandey
2020-07-16 5:31 ` Lukas Bulwahn
2020-07-17 9:54 ` Mrinal Pandey
2020-07-17 11:47 ` Lukas Bulwahn
2020-07-19 6:27 ` Mrinal Pandey
2020-07-19 7:13 ` Lukas Bulwahn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200721054419.kab7i6l6zkioddh5@mrinalpandey \
--to=mrinalmni@gmail.com \
--cc=Linux-kernel-mentees@lists.linuxfoundation.org \
--cc=lukas.bulwahn@gmail.com \
--cc=skhan@linuxfoundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).