[Qemu-devel] [PATCH] target/s390x: Fix LGPL version in the file header comments

Thomas Huth posted 1 patch 6 years, 9 months ago
Test docker-clang@ubuntu passed
Test docker-mingw@fedora passed
Test asan passed
Test checkpatch passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/1548769067-20792-1-git-send-email-thuth@redhat.com
Maintainers: David Hildenbrand <david@redhat.com>, Richard Henderson <rth@twiddle.net>, Cornelia Huck <cohuck@redhat.com>
target/s390x/cc_helper.c   | 2 +-
target/s390x/excp_helper.c | 2 +-
target/s390x/fpu_helper.c  | 2 +-
target/s390x/gdbstub.c     | 2 +-
target/s390x/helper.c      | 2 +-
target/s390x/int_helper.c  | 2 +-
target/s390x/mem_helper.c  | 2 +-
target/s390x/misc_helper.c | 2 +-
target/s390x/translate.c   | 2 +-
9 files changed, 9 insertions(+), 9 deletions(-)
[Qemu-devel] [PATCH] target/s390x: Fix LGPL version in the file header comments
Posted by Thomas Huth 6 years, 9 months ago
It's either "GNU *Library* General Public License version 2" or
"GNU Lesser General Public License version *2.1*", but there was
no "version 2.0" of the "Lesser" license. So assume that version
2.1 is meant here.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 target/s390x/cc_helper.c   | 2 +-
 target/s390x/excp_helper.c | 2 +-
 target/s390x/fpu_helper.c  | 2 +-
 target/s390x/gdbstub.c     | 2 +-
 target/s390x/helper.c      | 2 +-
 target/s390x/int_helper.c  | 2 +-
 target/s390x/mem_helper.c  | 2 +-
 target/s390x/misc_helper.c | 2 +-
 target/s390x/translate.c   | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/target/s390x/cc_helper.c b/target/s390x/cc_helper.c
index 5d91e45..307ad61 100644
--- a/target/s390x/cc_helper.c
+++ b/target/s390x/cc_helper.c
@@ -7,7 +7,7 @@
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c
index 2a33222..a758649 100644
--- a/target/s390x/excp_helper.c
+++ b/target/s390x/excp_helper.c
@@ -7,7 +7,7 @@
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/target/s390x/fpu_helper.c b/target/s390x/fpu_helper.c
index 1b662d2..e921172 100644
--- a/target/s390x/fpu_helper.c
+++ b/target/s390x/fpu_helper.c
@@ -7,7 +7,7 @@
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/target/s390x/gdbstub.c b/target/s390x/gdbstub.c
index b8c81da..df14759 100644
--- a/target/s390x/gdbstub.c
+++ b/target/s390x/gdbstub.c
@@ -7,7 +7,7 @@
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/target/s390x/helper.c b/target/s390x/helper.c
index 2546316..3d74836 100644
--- a/target/s390x/helper.c
+++ b/target/s390x/helper.c
@@ -7,7 +7,7 @@
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/target/s390x/int_helper.c b/target/s390x/int_helper.c
index abf77a9..abbbc20 100644
--- a/target/s390x/int_helper.c
+++ b/target/s390x/int_helper.c
@@ -7,7 +7,7 @@
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
index 490c43e..a506d9e 100644
--- a/target/s390x/mem_helper.c
+++ b/target/s390x/mem_helper.c
@@ -7,7 +7,7 @@
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c
index 3f91579..52262f6 100644
--- a/target/s390x/misc_helper.c
+++ b/target/s390x/misc_helper.c
@@ -7,7 +7,7 @@
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/target/s390x/translate.c b/target/s390x/translate.c
index b5bd56b..6249c70 100644
--- a/target/s390x/translate.c
+++ b/target/s390x/translate.c
@@ -7,7 +7,7 @@
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- 
1.8.3.1


Re: [Qemu-devel] [PATCH] target/s390x: Fix LGPL version in the file header comments
Posted by Cornelia Huck 6 years, 9 months ago
On Tue, 29 Jan 2019 14:37:47 +0100
Thomas Huth <thuth@redhat.com> wrote:

> It's either "GNU *Library* General Public License version 2" or
> "GNU Lesser General Public License version *2.1*", but there was
> no "version 2.0" of the "Lesser" license. So assume that version
> 2.1 is meant here.

I think we can assume that.

Given that there have been several of these cases (and that there's a
lot of boilerplate in general): Should we adopt SPDX license
identifiers for QEMU, as the Linux kernel did? They also discovered and
fixed some problems/oddities while at it.

> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  target/s390x/cc_helper.c   | 2 +-
>  target/s390x/excp_helper.c | 2 +-
>  target/s390x/fpu_helper.c  | 2 +-
>  target/s390x/gdbstub.c     | 2 +-
>  target/s390x/helper.c      | 2 +-
>  target/s390x/int_helper.c  | 2 +-
>  target/s390x/mem_helper.c  | 2 +-
>  target/s390x/misc_helper.c | 2 +-
>  target/s390x/translate.c   | 2 +-
>  9 files changed, 9 insertions(+), 9 deletions(-)

Is this going through the trivial tree? If so,

Acked-by: Cornelia Huck <cohuck@redhat.com>

I can also take this through the s390x tree.

Re: [Qemu-devel] [PATCH] target/s390x: Fix LGPL version in the file header comments
Posted by Philippe Mathieu-Daudé 6 years, 9 months ago
On 1/29/19 2:51 PM, Cornelia Huck wrote:
> On Tue, 29 Jan 2019 14:37:47 +0100
> Thomas Huth <thuth@redhat.com> wrote:
> 
>> It's either "GNU *Library* General Public License version 2" or
>> "GNU Lesser General Public License version *2.1*", but there was
>> no "version 2.0" of the "Lesser" license. So assume that version
>> 2.1 is meant here.
> 
> I think we can assume that.
> 
> Given that there have been several of these cases (and that there's a
> lot of boilerplate in general): Should we adopt SPDX license
> identifiers for QEMU, as the Linux kernel did? They also discovered and
> fixed some problems/oddities while at it.

This might be cheaper than adding checkpatch rules to parse current
licenses to avoid miswritten one coming back...

>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>>  target/s390x/cc_helper.c   | 2 +-
>>  target/s390x/excp_helper.c | 2 +-
>>  target/s390x/fpu_helper.c  | 2 +-
>>  target/s390x/gdbstub.c     | 2 +-
>>  target/s390x/helper.c      | 2 +-
>>  target/s390x/int_helper.c  | 2 +-
>>  target/s390x/mem_helper.c  | 2 +-
>>  target/s390x/misc_helper.c | 2 +-
>>  target/s390x/translate.c   | 2 +-
>>  9 files changed, 9 insertions(+), 9 deletions(-)
> 
> Is this going through the trivial tree? If so,
> 
> Acked-by: Cornelia Huck <cohuck@redhat.com>
> 
> I can also take this through the s390x tree.
> 

Re: [Qemu-devel] [PATCH] target/s390x: Fix LGPL version in the file header comments
Posted by Eric Blake 6 years, 9 months ago
On 1/29/19 7:51 AM, Cornelia Huck wrote:
> On Tue, 29 Jan 2019 14:37:47 +0100
> Thomas Huth <thuth@redhat.com> wrote:
> 
>> It's either "GNU *Library* General Public License version 2" or
>> "GNU Lesser General Public License version *2.1*", but there was
>> no "version 2.0" of the "Lesser" license. So assume that version
>> 2.1 is meant here.
> 
> I think we can assume that.
> 
> Given that there have been several of these cases (and that there's a
> lot of boilerplate in general): Should we adopt SPDX license
> identifiers for QEMU, as the Linux kernel did? They also discovered and
> fixed some problems/oddities while at it.

I'm also in favor of SPDX license identifiers - their brevity and
machine-parsability favors more accurate usage and fewer copy/paste
mistake propagation.

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org

Re: [Qemu-devel] [PATCH] target/s390x: Fix LGPL version in the file header comments
Posted by Daniel P. Berrangé 6 years, 9 months ago
On Wed, Jan 30, 2019 at 09:01:01AM -0600, Eric Blake wrote:
> On 1/29/19 7:51 AM, Cornelia Huck wrote:
> > On Tue, 29 Jan 2019 14:37:47 +0100
> > Thomas Huth <thuth@redhat.com> wrote:
> > 
> >> It's either "GNU *Library* General Public License version 2" or
> >> "GNU Lesser General Public License version *2.1*", but there was
> >> no "version 2.0" of the "Lesser" license. So assume that version
> >> 2.1 is meant here.
> > 
> > I think we can assume that.
> > 
> > Given that there have been several of these cases (and that there's a
> > lot of boilerplate in general): Should we adopt SPDX license
> > identifiers for QEMU, as the Linux kernel did? They also discovered and
> > fixed some problems/oddities while at it.
> 
> I'm also in favor of SPDX license identifiers - their brevity and
> machine-parsability favors more accurate usage and fewer copy/paste
> mistake propagation.

I'm curious if the kernel developers actually ended up removing the
current boilerplate license text from files they added SPDX tags
to ?

The original work only added SPDX tags to files which lacked any
pre-existing license text

  https://lwn.net/Articles/739183/

Although its from 2017, the LWN article indicates there was
some uncertainty about whether they'd actually go through with
removing license text, especially for files where the person
removing the text is not the exclusive copyright holder:


  "An additional goal is to eventually get rid of the other license
   texts; the consensus seems to be that the SPDX identifier is a 
   sufficient declaration of the license on its own. But removing
   license text from source files must be done with a great deal 
   of care, so it may be a long time before anybody works up the 
   courage to attempt that on any files that they do not themselves 
   own the copyright for. "

I can understand the sentiment that SPDX identifier alone should be
sufficient, but I think I'd want to see an explicit legal opinion from
a lawyer who works with open source before removing any license text.

Any one know if anything changed in this respect since that 2017
lwn article ?

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|

Re: [Qemu-devel] [PATCH] target/s390x: Fix LGPL version in the file header comments
Posted by Cornelia Huck 6 years, 9 months ago
On Wed, 30 Jan 2019 15:18:29 +0000
Daniel P. Berrangé <berrange@redhat.com> wrote:

> On Wed, Jan 30, 2019 at 09:01:01AM -0600, Eric Blake wrote:
> > On 1/29/19 7:51 AM, Cornelia Huck wrote:  
> > > On Tue, 29 Jan 2019 14:37:47 +0100
> > > Thomas Huth <thuth@redhat.com> wrote:
> > >   
> > >> It's either "GNU *Library* General Public License version 2" or
> > >> "GNU Lesser General Public License version *2.1*", but there was
> > >> no "version 2.0" of the "Lesser" license. So assume that version
> > >> 2.1 is meant here.  
> > > 
> > > I think we can assume that.
> > > 
> > > Given that there have been several of these cases (and that there's a
> > > lot of boilerplate in general): Should we adopt SPDX license
> > > identifiers for QEMU, as the Linux kernel did? They also discovered and
> > > fixed some problems/oddities while at it.  
> > 
> > I'm also in favor of SPDX license identifiers - their brevity and
> > machine-parsability favors more accurate usage and fewer copy/paste
> > mistake propagation.  
> 
> I'm curious if the kernel developers actually ended up removing the
> current boilerplate license text from files they added SPDX tags
> to ?
> 
> The original work only added SPDX tags to files which lacked any
> pre-existing license text
> 
>   https://lwn.net/Articles/739183/
> 
> Although its from 2017, the LWN article indicates there was
> some uncertainty about whether they'd actually go through with
> removing license text, especially for files where the person
> removing the text is not the exclusive copyright holder:
> 
> 
>   "An additional goal is to eventually get rid of the other license
>    texts; the consensus seems to be that the SPDX identifier is a 
>    sufficient declaration of the license on its own. But removing
>    license text from source files must be done with a great deal 
>    of care, so it may be a long time before anybody works up the 
>    courage to attempt that on any files that they do not themselves 
>    own the copyright for. "
> 
> I can understand the sentiment that SPDX identifier alone should be
> sufficient, but I think I'd want to see an explicit legal opinion from
> a lawyer who works with open source before removing any license text.
> 
> Any one know if anything changed in this respect since that 2017
> lwn article ?

The boilerplate texts have been removed; see e.g. 13d1d559f04a ("s390:
drivers: Remove redundant license text").

The commit messages for this and other patches also suggest that SPDX
identifiers are legally binding, so this has probably been vetted by a
couple of lawyers already.

Re: [Qemu-devel] [PATCH] target/s390x: Fix LGPL version in the file header comments
Posted by Richard Henderson 6 years, 9 months ago
On 1/30/19 7:01 AM, Eric Blake wrote:
> On 1/29/19 7:51 AM, Cornelia Huck wrote:
>> Given that there have been several of these cases (and that there's a
>> lot of boilerplate in general): Should we adopt SPDX license
>> identifiers for QEMU, as the Linux kernel did? They also discovered and
>> fixed some problems/oddities while at it.
> 
> I'm also in favor of SPDX license identifiers - their brevity and
> machine-parsability favors more accurate usage and fewer copy/paste
> mistake propagation.

+1.


r~

Re: [Qemu-devel] [Qemu-trivial] [PATCH] target/s390x: Fix LGPL version in the file header comments
Posted by Laurent Vivier 6 years, 9 months ago
On 29/01/2019 14:37, Thomas Huth wrote:
> It's either "GNU *Library* General Public License version 2" or
> "GNU Lesser General Public License version *2.1*", but there was
> no "version 2.0" of the "Lesser" license. So assume that version
> 2.1 is meant here.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>  target/s390x/cc_helper.c   | 2 +-
>  target/s390x/excp_helper.c | 2 +-
>  target/s390x/fpu_helper.c  | 2 +-
>  target/s390x/gdbstub.c     | 2 +-
>  target/s390x/helper.c      | 2 +-
>  target/s390x/int_helper.c  | 2 +-
>  target/s390x/mem_helper.c  | 2 +-
>  target/s390x/misc_helper.c | 2 +-
>  target/s390x/translate.c   | 2 +-
>  9 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/target/s390x/cc_helper.c b/target/s390x/cc_helper.c
> index 5d91e45..307ad61 100644
> --- a/target/s390x/cc_helper.c
> +++ b/target/s390x/cc_helper.c
> @@ -7,7 +7,7 @@
>   * This library is free software; you can redistribute it and/or
>   * modify it under the terms of the GNU Lesser General Public
>   * License as published by the Free Software Foundation; either
> - * version 2 of the License, or (at your option) any later version.
> + * version 2.1 of the License, or (at your option) any later version.
>   *
>   * This library is distributed in the hope that it will be useful,
>   * but WITHOUT ANY WARRANTY; without even the implied warranty of
> diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c
> index 2a33222..a758649 100644
> --- a/target/s390x/excp_helper.c
> +++ b/target/s390x/excp_helper.c
> @@ -7,7 +7,7 @@
>   * This library is free software; you can redistribute it and/or
>   * modify it under the terms of the GNU Lesser General Public
>   * License as published by the Free Software Foundation; either
> - * version 2 of the License, or (at your option) any later version.
> + * version 2.1 of the License, or (at your option) any later version.
>   *
>   * This library is distributed in the hope that it will be useful,
>   * but WITHOUT ANY WARRANTY; without even the implied warranty of
> diff --git a/target/s390x/fpu_helper.c b/target/s390x/fpu_helper.c
> index 1b662d2..e921172 100644
> --- a/target/s390x/fpu_helper.c
> +++ b/target/s390x/fpu_helper.c
> @@ -7,7 +7,7 @@
>   * This library is free software; you can redistribute it and/or
>   * modify it under the terms of the GNU Lesser General Public
>   * License as published by the Free Software Foundation; either
> - * version 2 of the License, or (at your option) any later version.
> + * version 2.1 of the License, or (at your option) any later version.
>   *
>   * This library is distributed in the hope that it will be useful,
>   * but WITHOUT ANY WARRANTY; without even the implied warranty of
> diff --git a/target/s390x/gdbstub.c b/target/s390x/gdbstub.c
> index b8c81da..df14759 100644
> --- a/target/s390x/gdbstub.c
> +++ b/target/s390x/gdbstub.c
> @@ -7,7 +7,7 @@
>   * This library is free software; you can redistribute it and/or
>   * modify it under the terms of the GNU Lesser General Public
>   * License as published by the Free Software Foundation; either
> - * version 2 of the License, or (at your option) any later version.
> + * version 2.1 of the License, or (at your option) any later version.
>   *
>   * This library is distributed in the hope that it will be useful,
>   * but WITHOUT ANY WARRANTY; without even the implied warranty of
> diff --git a/target/s390x/helper.c b/target/s390x/helper.c
> index 2546316..3d74836 100644
> --- a/target/s390x/helper.c
> +++ b/target/s390x/helper.c
> @@ -7,7 +7,7 @@
>   * This library is free software; you can redistribute it and/or
>   * modify it under the terms of the GNU Lesser General Public
>   * License as published by the Free Software Foundation; either
> - * version 2 of the License, or (at your option) any later version.
> + * version 2.1 of the License, or (at your option) any later version.
>   *
>   * This library is distributed in the hope that it will be useful,
>   * but WITHOUT ANY WARRANTY; without even the implied warranty of
> diff --git a/target/s390x/int_helper.c b/target/s390x/int_helper.c
> index abf77a9..abbbc20 100644
> --- a/target/s390x/int_helper.c
> +++ b/target/s390x/int_helper.c
> @@ -7,7 +7,7 @@
>   * This library is free software; you can redistribute it and/or
>   * modify it under the terms of the GNU Lesser General Public
>   * License as published by the Free Software Foundation; either
> - * version 2 of the License, or (at your option) any later version.
> + * version 2.1 of the License, or (at your option) any later version.
>   *
>   * This library is distributed in the hope that it will be useful,
>   * but WITHOUT ANY WARRANTY; without even the implied warranty of
> diff --git a/target/s390x/mem_helper.c b/target/s390x/mem_helper.c
> index 490c43e..a506d9e 100644
> --- a/target/s390x/mem_helper.c
> +++ b/target/s390x/mem_helper.c
> @@ -7,7 +7,7 @@
>   * This library is free software; you can redistribute it and/or
>   * modify it under the terms of the GNU Lesser General Public
>   * License as published by the Free Software Foundation; either
> - * version 2 of the License, or (at your option) any later version.
> + * version 2.1 of the License, or (at your option) any later version.
>   *
>   * This library is distributed in the hope that it will be useful,
>   * but WITHOUT ANY WARRANTY; without even the implied warranty of
> diff --git a/target/s390x/misc_helper.c b/target/s390x/misc_helper.c
> index 3f91579..52262f6 100644
> --- a/target/s390x/misc_helper.c
> +++ b/target/s390x/misc_helper.c
> @@ -7,7 +7,7 @@
>   * This library is free software; you can redistribute it and/or
>   * modify it under the terms of the GNU Lesser General Public
>   * License as published by the Free Software Foundation; either
> - * version 2 of the License, or (at your option) any later version.
> + * version 2.1 of the License, or (at your option) any later version.
>   *
>   * This library is distributed in the hope that it will be useful,
>   * but WITHOUT ANY WARRANTY; without even the implied warranty of
> diff --git a/target/s390x/translate.c b/target/s390x/translate.c
> index b5bd56b..6249c70 100644
> --- a/target/s390x/translate.c
> +++ b/target/s390x/translate.c
> @@ -7,7 +7,7 @@
>   * This library is free software; you can redistribute it and/or
>   * modify it under the terms of the GNU Lesser General Public
>   * License as published by the Free Software Foundation; either
> - * version 2 of the License, or (at your option) any later version.
> + * version 2.1 of the License, or (at your option) any later version.
>   *
>   * This library is distributed in the hope that it will be useful,
>   * but WITHOUT ANY WARRANTY; without even the implied warranty of
> 

Applied to my trivial-patches branch.

Thanks,
Laurent