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: Joe Perches <j...@perches.com>
Reviewed-by: Josh Triplett <j...@joshtriplett.org>
---
scripts/checkpatch.pl | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index c12234e..abd1811 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -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
--
1.8.1.2.459.gbcd45b4.dirty
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
