[PATCH 0/2] scripts/spelling.txt: add GPL-2.0+

[PATCH 0/2] scripts/spelling.txt: add GPL-2.0+

[Heinrich Schuchardt]

The correct SPDX identifier for the 'GNU General Public License v2.0 or
later' is GPL-2.0-or-later.

Checkpatch.pl uses the misspelled words from spelling.txt both as keys of a
hash and as part of a regular expression. For usage in the regular
expression special characters like the plus sign need to be escaped.

Heinrich Schuchardt (2):
  checkpatch: allow special characters in spelling.txt
  scripts/spelling.txt: add GPL-2.0+

 scripts/checkpatch.pl | 2 +-
 scripts/spelling.txt  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

-- 
2.45.2

[PATCH 1/2] checkpatch: allow special characters in spelling.txt

[Heinrich Schuchardt]

Checkpatch.pl uses the misspelled words from spelling.txt both as keys of a
hash and as part of a regular expression. For usage in the regular
expression special characters like the plus sign need to be escaped.

Escape special characters in the list of misspelled words.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
---
 scripts/checkpatch.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 744328d21eb8..572411aaa4be 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -978,7 +978,7 @@ if ($codespell) {
 	}
 }
 
-$misspellings = join("|", sort keys %spelling_fix) if keys %spelling_fix;
+$misspellings = join("|", map{quotemeta($_)} sort keys %spelling_fix) if keys %spelling_fix;
 
 sub read_words {
 	my ($wordsRef, $file) = @_;
-- 
2.45.2

[PATCH 2/2] scripts/spelling.txt: add GPL-2.0+

[Heinrich Schuchardt]

The correct SPDX identifier for the 'GNU General Public License v2.0 or
later' is GPL-2.0-or-later.

Link: https://spdx.org/licenses/GPL-2.0-or-later.html
Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
---
 scripts/spelling.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/spelling.txt b/scripts/spelling.txt
index 2decc50f5a6e..8cc59ee68928 100644
--- a/scripts/spelling.txt
+++ b/scripts/spelling.txt
@@ -772,6 +772,7 @@ genric||generic
 gerenal||general
 geting||getting
 globel||global
+gpl-2.0+||GPL-2.0-or-later
 grabing||grabbing
 grahical||graphical
 grahpical||graphical
-- 
2.45.2

Re: [PATCH 2/2] scripts/spelling.txt: add GPL-2.0+

[WangYuli]

[-- Attachment #1.1.1: Type: text/plain, Size: 644 bytes --]

On 2024/12/15 10:51, Heinrich Schuchardt wrote:

> The correct SPDX identifier for the 'GNU General Public License v2.0 or
> later' is GPL-2.0-or-later.
>
> Link: https://spdx.org/licenses/GPL-2.0-or-later.html
> Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
> ---
>   scripts/spelling.txt | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/scripts/spelling.txt b/scripts/spelling.txt
> index 2decc50f5a6e..8cc59ee68928 100644
> --- a/scripts/spelling.txt
> +++ b/scripts/spelling.txt

This isn't a typo.

Using spelling.txt to check this isn't the right approach.


Thanks,
-- 
WangYuli

[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 645 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]

Re: [PATCH 0/2] scripts/spelling.txt: add GPL-2.0+

[Joe Perches]

On Sun, 2024-12-15 at 03:51 +0100, Heinrich Schuchardt wrote:
> The correct SPDX identifier for the 'GNU General Public License v2.0 or
> later' is GPL-2.0-or-later.

I think this unnecessary as there's a separate script
to check the appropriate SPDX uses treewide and there
isn't a single existing use of "gpl-2.0+' in the tree.


> 
> Checkpatch.pl uses the misspelled words from spelling.txt both as keys of a
> hash and as part of a regular expression. For usage in the regular
> expression special characters like the plus sign need to be escaped.
> 
> Heinrich Schuchardt (2):
>   checkpatch: allow special characters in spelling.txt
>   scripts/spelling.txt: add GPL-2.0+
> 
>  scripts/checkpatch.pl | 2 +-
>  scripts/spelling.txt  | 1 +
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 

Re: [PATCH 0/2] scripts/spelling.txt: add GPL-2.0+

[Heinrich Schuchardt]

On 12/15/24 11:51, Joe Perches wrote:
> On Sun, 2024-12-15 at 03:51 +0100, Heinrich Schuchardt wrote:
>> The correct SPDX identifier for the 'GNU General Public License v2.0 or
>> later' is GPL-2.0-or-later.
> 
> I think this unnecessary as there's a separate script
> to check the appropriate SPDX uses treewide and there
> isn't a single existing use of "gpl-2.0+' in the tree.

Hello Joe,

In next-20241213 I find 5143 occurrences with

git grep -ni 'gpl-2\.0+' | wc -l

e.g.

Documentation/bpf/prog_lsm.rst:1:.. SPDX-License-Identifier: GPL-2.0+
drivers/ata/sata_rcar.c:1:// SPDX-License-Identifier: GPL-2.0+

Some additions are quite recent:

$ git diff HEAD~100 | grep -i 'gpl-2\.0+' | wc -l
63

Best regards

Heinrich

> 
> 
>>
>> Checkpatch.pl uses the misspelled words from spelling.txt both as keys of a
>> hash and as part of a regular expression. For usage in the regular
>> expression special characters like the plus sign need to be escaped.
>>
>> Heinrich Schuchardt (2):
>>    checkpatch: allow special characters in spelling.txt
>>    scripts/spelling.txt: add GPL-2.0+
>>
>>   scripts/checkpatch.pl | 2 +-
>>   scripts/spelling.txt  | 1 +
>>   2 files changed, 2 insertions(+), 1 deletion(-)
>>
> 

Re: [PATCH 0/2] scripts/spelling.txt: add GPL-2.0+

[Joe Perches]

On Sun, 2024-12-15 at 13:41 +0100, Heinrich Schuchardt wrote:
> On 12/15/24 11:51, Joe Perches wrote:
> > On Sun, 2024-12-15 at 03:51 +0100, Heinrich Schuchardt wrote:
> > > The correct SPDX identifier for the 'GNU General Public License v2.0 or
> > > later' is GPL-2.0-or-later.
> > 
> > I think this unnecessary as there's a separate script
> > to check the appropriate SPDX uses treewide and there
> > isn't a single existing use of "gpl-2.0+' in the tree.
> 
> Hello Joe,
> 
> In next-20241213 I find 5143 occurrences with
> 
> git grep -ni 'gpl-2\.0+' | wc -l

So no uses of 'gpl-2.0+' but many of 'GPL-2.0+'

And perhaps read this:

https://lore.kernel.org/all/CAHk-=wi2bdXuYhC9bd9FShtcf_u-6RUb3Qr_aXq3XtbCxR5NGQ@mail.gmail.com/