2014-01-07 17:42:37

by Duyck, Alexander H

[permalink] [raw]
Subject: [PATCH v2] checkpatch: Only flag FSF address, not gnu.org URL

This change restricts the check for the for the FSF address in the GPL
copyright statement so that it only flags the address, not the references to
the gnu.org/licenses URL which appears to be used in numerous drivers. The
idea is to still allow some reference to an external copy of the GPL in the
event that files are copied out of the kernel tree without the COPYING file.

So for example this statement will still return an error:
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

However, this statement will not return an error after this patch:
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.

Signed-off-by: Alexander Duyck <[email protected]>
---

v2: Rebased patch off of linux-next tree.
Updated patch description to include motivation behind change.

scripts/checkpatch.pl | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 07331d6..e7f2c65 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1970,14 +1970,12 @@ sub process {
}

# Check for FSF mailing addresses.
- if ($rawline =~ /\bYou should have received a copy/i ||
- $rawline =~ /\bwrite to the Free/i ||
+ if ($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)
}


2014-01-07 17:48:50

by Joe Perches

[permalink] [raw]
Subject: Re: [PATCH v2] checkpatch: Only flag FSF address, not gnu.org URL

On Tue, 2014-01-07 at 09:41 -0800, Alexander Duyck wrote:
> This change restricts the check for the for the FSF address in the GPL
> copyright statement so that it only flags the address, not the references to
> the gnu.org/licenses URL which appears to be used in numerous drivers. The
> idea is to still allow some reference to an external copy of the GPL in the
> event that files are copied out of the kernel tree without the COPYING file.

Looks OK to me.