From a9a5c17cf5e1f55310aa218f178997f090304172 Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Thu, 27 Nov 2014 10:54:07 +0300 Subject: [PATCH] checkpatch: fix check for the FSF address Commit 4525c0a4c4d0aaa199c37a6d2245617e8445f213 cherry-picked check for the FSF address presence from upstream. However, it has a typo resulting in this obscure error when triggered: Use of uninitialized value in concatenation (.) or string at /home/jenkins/.jenkins/jobs/openocd-gerrit/workspace/tools/scripts/checkpatch.pl line 1258. ERROR: This patch fixes it. Change-Id: Ia417ef4782d21c8b3f1d39de88c4ab850a5a6630 Signed-off-by: Paul Fertser Reviewed-on: http://openocd.zylin.com/2414 Tested-by: jenkins Reviewed-by: Andreas Fritiofson --- tools/scripts/checkpatch.pl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/scripts/checkpatch.pl b/tools/scripts/checkpatch.pl index b3a085483..4eb50c3cb 100755 --- a/tools/scripts/checkpatch.pl +++ b/tools/scripts/checkpatch.pl @@ -1635,8 +1635,10 @@ sub process { $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; - ERROR("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) + ERROR("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. " . + "OpenOCD already includes a copy of the GPL.\n" . $herevet) } # check for Kconfig help text having a real description