Commit 3e2232f2 authored by Joe Perches's avatar Joe Perches Committed by Linus Torvalds
Browse files

checkpatch: update the FSF/GPL address check



The FSF address check is a bit too verbose looking for the GPL text.
Quiet it a bit by requiring --strict for the GPL bit.

Also make the address tests match a few uses of abbreviations for street
names and make it case insensitive.
Signed-off-by: default avatarJoe Perches <joe@perches.com>
Reviewed-by: default avatarJosh Triplett <josh@joshtriplett.org>
Cc: Manfred Spraul <manfred@colorfullife.com>
Cc: Andy Whitcroft <apw@canonical.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 189248d8
......@@ -1970,15 +1970,16 @@ sub process {
}
# Check for FSF mailing addresses.
if ($rawline =~ /You should have received a copy/ ||
$rawline =~ /write to the Free Software/ ||
$rawline =~ /59 Temple Place/ ||
$rawline =~ /51 Franklin Street/) {
if ($rawline =~ /\bYou should have received a copy/i ||
$rawline =~ /\bwrite to the Free/i ||
$rawline =~ /\b59\s+Temple\s+Pl/i ||
$rawline =~ /\b51\s+Franklin\s+St/i) {
my $herevet = "$here\n" . cat_vet($rawline) . "\n";
my $msg_type = \&ERROR;
$msg_type = \&CHK if ($file);
$msg_type = \&CHK if ($rawline =~ /\bYou should have received a copy/i);
&{$msg_type}("FSF_MAILING_ADDRESS",
"Do not include the paragraph about writing to the Free Software Foundation's mailing address from the sample GPL notice. The FSF has changed addresses in the past, and may do so again. Linux already includes a copy of the GPL.\n" . $herevet)
"Do not include the paragraph about writing to the Free Software Foundation's mailing address from the sample GPL notice. The FSF has changed addresses in the past, and may do so again. Linux already includes a copy of the GPL.\n" . $herevet)
}
# check for Kconfig help text having a real description
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment