Skip to contentSkip to conversation

s390x: Fix the confusing contributions-after-2012 license statements

PATCH Applied Thomas Huth 5 participants 12 messages Feb 6, 2019 – Feb 11, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 s390x: Fix the confusing contributions-after-2012 license statements

The license information in these files is rather confusing. The text declares LGPL first, but then says that contributions after 2012 are licensed under the GPL instead. How should the average user who just downloaded the release tarball know which part is now GPL and which is LGPL?

Looking at the text of the LGPL (see COPYING.LIB in the top directory), the license clearly states how this should be done instead:

"3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License."

Thus let's clean up the confusing statements and use the proper GPL text only.

---
 linux-user/s390x/target_cpu.h | 19 ++++++++-----------
 target/s390x/cpu.c            | 19 ++++++++-----------
 target/s390x/cpu.h            | 19 ++++++++-----------
 target/s390x/kvm.c            | 19 ++++++++-----------
 4 files changed, 32 insertions(+), 44 deletions(-)
linux-user/s390x/target_cpu.h +8 -11
index 66ef8aa..aa181ce 100644
@@ -3,21 +3,18 @@
  *
  * Copyright (c) 2009 Ulrich Hecht
  *
- * 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.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * General Public License for more details.
  *
- * Contributions after 2012-10-29 are licensed under the terms of the
- * GNU GPL, version 2 or (at your option) any later version.
- *
- * You should have received a copy of the GNU (Lesser) General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef S390X_TARGET_CPU_H
 #define S390X_TARGET_CPU_H
target/s390x/cpu.c +8 -11
index 18ba7f8..698dd9c 100644
@@ -6,21 +6,18 @@
  * Copyright (c) 2012 SUSE LINUX Products GmbH
  * Copyright (c) 2012 IBM Corp.
  *
- * 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.1 of the License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see
- * <http://www.gnu.org/licenses/lgpl-2.1.html>
- * Contributions after 2012-12-11 are licensed under the terms of the
- * GNU GPL, version 2 or (at your option) any later version.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "qemu/osdep.h"
target/s390x/cpu.h +8 -11
index 47d2c2e..b71ac51 100644
@@ -4,21 +4,18 @@
  *  Copyright (c) 2009 Ulrich Hecht
  *  Copyright IBM Corp. 2012, 2018
  *
- * 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.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * General Public License for more details.
  *
- * Contributions after 2012-10-29 are licensed under the terms of the
- * GNU GPL, version 2 or (at your option) any later version.
- *
- * You should have received a copy of the GNU (Lesser) General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef S390X_CPU_H
target/s390x/kvm.c +8 -11
index 8613e19..9ff80c8 100644
@@ -4,21 +4,18 @@
  * Copyright (c) 2009 Alexander Graf <[email protected]>
  * Copyright IBM Corp. 2012
  *
- * 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.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * General Public License for more details.
  *
- * Contributions after 2012-10-29 are licensed under the terms of the
- * GNU GPL, version 2 or (at your option) any later version.
- *
- * You should have received a copy of the GNU (Lesser) General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "qemu/osdep.h"
Signature · 1 line
1.8.3.1
#1 lore raw
Quoted 5 lines · On Wed, 6 Feb 2019 13:41:33 +0100 Thomas Huth <[email protected]> wrote:

The license information in these files is rather confusing. The text declares LGPL first, but then says that contributions after 2012 are licensed under the GPL instead. How should the average user who just downloaded the release tarball know which part is now GPL and which is LGPL?

FWIW, that statement was added in ccb084d3f0ec ("s390: new contributions GPLv2 or later").

Quoted 9 lines

Looking at the text of the LGPL (see COPYING.LIB in the top directory), the license clearly states how this should be done instead:

"3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License."

Hm. This talks about GPL v2, not GPL v2-or-later...

Quoted 10 lines

Thus let's clean up the confusing statements and use the proper GPL text only.

---
 linux-user/s390x/target_cpu.h | 19 ++++++++-----------
 target/s390x/cpu.c            | 19 ++++++++-----------
 target/s390x/cpu.h            | 19 ++++++++-----------
 target/s390x/kvm.c            | 19 ++++++++-----------

BTW: Is the original author of the code still around?

Quoted 1 line
 4 files changed, 32 insertions(+), 44 deletions(-)
#2 lore raw
Quoted 16 lines · Cornelia Huck
Quoted 5 lines · On Wed, 6 Feb 2019 13:41:33 +0100 Thomas Huth <[email protected]> wrote:

The license information in these files is rather confusing. The text declares LGPL first, but then says that contributions after 2012 are licensed under the GPL instead. How should the average user who just downloaded the release tarball know which part is now GPL and which is LGPL?

FWIW, that statement was added in ccb084d3f0ec ("s390: new contributions GPLv2 or later").

Quoted 4 lines

Looking at the text of the LGPL (see COPYING.LIB in the top directory), the license clearly states how this should be done instead:

Quoted 7 lines
Quoted 5 lines

"3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License."

Hm. This talks about GPL v2, not GPL v2-or-later...

IANAL, but since all the files originally were licensed under LGPLv2-or-later, that should not be an issue, as far as I can see: You then could also upgrade the LGPLv2-or-later code to LGPLv3-or-later, which in turn allows you to license under GPLv3. So LGPLv2-or-later means you can put the code also under GPLv2-or-later. Or do I miss something?

Thomas

#3 lore raw
Quoted 23 lines · On Wed, 6 Feb 2019 14:09:40 +0100 Thomas Huth <[email protected]> wrote:
Quoted 22 lines · Cornelia Huck
Quoted 5 lines · On Wed, 6 Feb 2019 13:41:33 +0100 Thomas Huth <[email protected]> wrote:

The license information in these files is rather confusing. The text declares LGPL first, but then says that contributions after 2012 are licensed under the GPL instead. How should the average user who just downloaded the release tarball know which part is now GPL and which is LGPL?

FWIW, that statement was added in ccb084d3f0ec ("s390: new contributions GPLv2 or later").

Quoted 9 lines

Looking at the text of the LGPL (see COPYING.LIB in the top directory), the license clearly states how this should be done instead:

"3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License."

Quoted 8 lines
Quoted 1 line

Hm. This talks about GPL v2, not GPL v2-or-later...

IANAL, but since all the files originally were licensed under LGPLv2-or-later, that should not be an issue, as far as I can see: You then could also upgrade the LGPLv2-or-later code to LGPLv3-or-later, which in turn allows you to license under GPLv3. So LGPLv2-or-later means you can put the code also under GPLv2-or-later. Or do I miss something?

That would seem logical, but IANAL, either...

Anyway, I'd be happy to queue this if I get acks :)

#4 lore raw
Quoted 35 lines · Cornelia Huck
Quoted 23 lines · On Wed, 6 Feb 2019 14:09:40 +0100 Thomas Huth <[email protected]> wrote:
Quoted 22 lines · Cornelia Huck
Quoted 5 lines · On Wed, 6 Feb 2019 13:41:33 +0100 Thomas Huth <[email protected]> wrote:

The license information in these files is rather confusing. The text declares LGPL first, but then says that contributions after 2012 are licensed under the GPL instead. How should the average user who just downloaded the release tarball know which part is now GPL and which is LGPL?

FWIW, that statement was added in ccb084d3f0ec ("s390: new contributions GPLv2 or later").

Quoted 9 lines

Looking at the text of the LGPL (see COPYING.LIB in the top directory), the license clearly states how this should be done instead:

"3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License."

Quoted 8 lines
Quoted 1 line

Hm. This talks about GPL v2, not GPL v2-or-later...

IANAL, but since all the files originally were licensed under LGPLv2-or-later, that should not be an issue, as far as I can see: You then could also upgrade the LGPLv2-or-later code to LGPLv3-or-later, which in turn allows you to license under GPLv3. So LGPLv2-or-later means you can put the code also under GPLv2-or-later. Or do I miss something?

Quoted 4 lines

That would seem logical, but IANAL, either...

Anyway, I'd be happy to queue this if I get acks :)

For the linux-user part:

#5 lore raw
In reply to Cornelia Huck
Quoted 28 lines · Cornelia Huck
Quoted 5 lines · On Wed, 6 Feb 2019 13:41:33 +0100 Thomas Huth <[email protected]> wrote:

The license information in these files is rather confusing. The text declares LGPL first, but then says that contributions after 2012 are licensed under the GPL instead. How should the average user who just downloaded the release tarball know which part is now GPL and which is LGPL?

FWIW, that statement was added in ccb084d3f0ec ("s390: new contributions GPLv2 or later").

Quoted 9 lines

Looking at the text of the LGPL (see COPYING.LIB in the top directory), the license clearly states how this should be done instead:

"3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License."

Hm. This talks about GPL v2, not GPL v2-or-later...

Quoted 4 lines

Thus let's clean up the confusing statements and use the proper GPL text only.

Quoted 8 lines
Quoted 6 lines
---
 linux-user/s390x/target_cpu.h | 19 ++++++++-----------
 target/s390x/cpu.c            | 19 ++++++++-----------
 target/s390x/cpu.h            | 19 ++++++++-----------
 target/s390x/kvm.c            | 19 ++++++++-----------

BTW: Is the original author of the code still around?

For the linux-user/s390x/target_cpu.h, it seems this code has been pushed by Alex Graf:

commit 10ec51174ca69a4c3c5149b0b3baaa6ccba66273

Author: Alexander Graf <[email protected]>
Date:   Sat Dec 5 12:44:21 2009 +0100

S/390 CPU fake emulation

Because Qemu currently requires a TCG target to exist and there are quite some useful helpers here to lay the groundwork for out KVM target, let's create a stub TCG emulation target for S390X CPUs.

This is required to make tcg happy. The emulation target itself won't work though.

But the "(c) 2009 Ulrich Hecht" is confusing.

Laurent

#6 lore raw
Quoted 44 lines · Laurent Vivier
Quoted 24 lines · Cornelia Huck
Quoted 5 lines · On Wed, 6 Feb 2019 13:41:33 +0100 Thomas Huth <[email protected]> wrote:

The license information in these files is rather confusing. The text declares LGPL first, but then says that contributions after 2012 are licensed under the GPL instead. How should the average user who just downloaded the release tarball know which part is now GPL and which is LGPL?

FWIW, that statement was added in ccb084d3f0ec ("s390: new contributions GPLv2 or later").

Quoted 8 lines

Looking at the text of the LGPL (see COPYING.LIB in the top directory), the license clearly states how this should be done instead:

"3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License."

Hm. This talks about GPL v2, not GPL v2-or-later...

Quoted 3 lines

Thus let's clean up the confusing statements and use the proper GPL text only.

Quoted 7 lines
Quoted 6 lines
---
  linux-user/s390x/target_cpu.h | 19 ++++++++-----------
  target/s390x/cpu.c            | 19 ++++++++-----------
  target/s390x/cpu.h            | 19 ++++++++-----------
  target/s390x/kvm.c            | 19 ++++++++-----------

BTW: Is the original author of the code still around?

For the linux-user/s390x/target_cpu.h, it seems this code has been pushed by Alex Graf:

commit 10ec51174ca69a4c3c5149b0b3baaa6ccba66273

Author: Alexander Graf <[email protected]>
Date:   Sat Dec 5 12:44:21 2009 +0100

S/390 CPU fake emulation

Because Qemu currently requires a TCG target to exist and there are quite some useful helpers here to lay the groundwork for out KVM target, let's create a stub TCG emulation target for S390X CPUs.

Quoted 7 lines

This is required to make tcg happy. The emulation target itself won't work though.

But the "(c) 2009 Ulrich Hecht" is confusing.

Why? Ulrich was the one that started the port, I then cleaned it up, improved it, added system emulation and upstreamed it.

What problem exactly are you trying to solve?

Alex

#7 lore raw
Quoted 48 lines · On Mon, 11 Feb 2019 16:24:48 +0100 Alexander Graf <[email protected]> wrote:
Quoted 47 lines · Laurent Vivier
Quoted 24 lines · Cornelia Huck
Quoted 5 lines · On Wed, 6 Feb 2019 13:41:33 +0100 Thomas Huth <[email protected]> wrote:

The license information in these files is rather confusing. The text declares LGPL first, but then says that contributions after 2012 are licensed under the GPL instead. How should the average user who just downloaded the release tarball know which part is now GPL and which is LGPL?

FWIW, that statement was added in ccb084d3f0ec ("s390: new contributions GPLv2 or later").

Quoted 8 lines

Looking at the text of the LGPL (see COPYING.LIB in the top directory), the license clearly states how this should be done instead:

"3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License."

Hm. This talks about GPL v2, not GPL v2-or-later...

Quoted 3 lines

Thus let's clean up the confusing statements and use the proper GPL text only.

Quoted 7 lines
Quoted 6 lines
---
  linux-user/s390x/target_cpu.h | 19 ++++++++-----------
  target/s390x/cpu.c            | 19 ++++++++-----------
  target/s390x/cpu.h            | 19 ++++++++-----------
  target/s390x/kvm.c            | 19 ++++++++-----------  

BTW: Is the original author of the code still around?

For the linux-user/s390x/target_cpu.h, it seems this code has been pushed by Alex Graf:

commit 10ec51174ca69a4c3c5149b0b3baaa6ccba66273

Author: Alexander Graf <[email protected]>
Date:   Sat Dec 5 12:44:21 2009 +0100

S/390 CPU fake emulation

Because Qemu currently requires a TCG target to exist and there are quite some useful helpers here to lay the groundwork for out KVM target, let's create a stub TCG emulation target for S390X CPUs.

This is required to make tcg happy. The emulation target itself won't work though.

Quoted 7 lines
Quoted 4 lines

But the "(c) 2009 Ulrich Hecht" is confusing.

Why? Ulrich was the one that started the port, I then cleaned it up, improved it, added system emulation and upstreamed it.

It's just a bit confusing that Ulrich does not show up in the sign-off chain.

Quoted 1 line

What problem exactly are you trying to solve?

The confusing license statements?

I thought I'd ask whether the original author had any thoughts; if you think this patch is problematic, I can dequeue it again.

#8 lore raw
Quoted 57 lines · Cornelia Huck
Quoted 48 lines · On Mon, 11 Feb 2019 16:24:48 +0100 Alexander Graf <[email protected]> wrote:
Quoted 47 lines · Laurent Vivier
Quoted 24 lines · Cornelia Huck
Quoted 5 lines · On Wed, 6 Feb 2019 13:41:33 +0100 Thomas Huth <[email protected]> wrote:

The license information in these files is rather confusing. The text declares LGPL first, but then says that contributions after 2012 are licensed under the GPL instead. How should the average user who just downloaded the release tarball know which part is now GPL and which is LGPL?

FWIW, that statement was added in ccb084d3f0ec ("s390: new contributions GPLv2 or later").

Quoted 8 lines

Looking at the text of the LGPL (see COPYING.LIB in the top directory), the license clearly states how this should be done instead:

"3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License."

Hm. This talks about GPL v2, not GPL v2-or-later...

Quoted 3 lines

Thus let's clean up the confusing statements and use the proper GPL text only.

Quoted 7 lines
Quoted 6 lines
---
   linux-user/s390x/target_cpu.h | 19 ++++++++-----------
   target/s390x/cpu.c            | 19 ++++++++-----------
   target/s390x/cpu.h            | 19 ++++++++-----------
   target/s390x/kvm.c            | 19 ++++++++-----------

BTW: Is the original author of the code still around?

For the linux-user/s390x/target_cpu.h, it seems this code has been pushed by Alex Graf:

commit 10ec51174ca69a4c3c5149b0b3baaa6ccba66273

Author: Alexander Graf <[email protected]>
Date:   Sat Dec 5 12:44:21 2009 +0100

S/390 CPU fake emulation

Because Qemu currently requires a TCG target to exist and there are quite some useful helpers here to lay the groundwork for out KVM target, let's create a stub TCG emulation target for S390X CPUs.

This is required to make tcg happy. The emulation target itself won't work though.

Quoted 6 lines
Quoted 4 lines

But the "(c) 2009 Ulrich Hecht" is confusing.

Why? Ulrich was the one that started the port, I then cleaned it up, improved it, added system emulation and upstreamed it.

Quoted 8 lines

It's just a bit confusing that Ulrich does not show up in the sign-off chain.

Quoted 1 line

What problem exactly are you trying to solve?

The confusing license statements?

I thought I'd ask whether the original author had any thoughts; if you think this patch is problematic, I can dequeue it again.

You can always combine LGPL and GPL code and the result becomes GPL only, so I see little problem? :)

Alex

#9 lore raw
Quoted 61 lines · On Mon, 11 Feb 2019 17:00:32 +0100 Alexander Graf <[email protected]> wrote:
Quoted 60 lines · Cornelia Huck
Quoted 48 lines · On Mon, 11 Feb 2019 16:24:48 +0100 Alexander Graf <[email protected]> wrote:
Quoted 47 lines · Laurent Vivier
Quoted 24 lines · Cornelia Huck
Quoted 5 lines · On Wed, 6 Feb 2019 13:41:33 +0100 Thomas Huth <[email protected]> wrote:

The license information in these files is rather confusing. The text declares LGPL first, but then says that contributions after 2012 are licensed under the GPL instead. How should the average user who just downloaded the release tarball know which part is now GPL and which is LGPL?

FWIW, that statement was added in ccb084d3f0ec ("s390: new contributions GPLv2 or later").

Quoted 8 lines

Looking at the text of the LGPL (see COPYING.LIB in the top directory), the license clearly states how this should be done instead:

"3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License."

Hm. This talks about GPL v2, not GPL v2-or-later...

Quoted 3 lines

Thus let's clean up the confusing statements and use the proper GPL text only.

Quoted 7 lines
Quoted 6 lines
---
   linux-user/s390x/target_cpu.h | 19 ++++++++-----------
   target/s390x/cpu.c            | 19 ++++++++-----------
   target/s390x/cpu.h            | 19 ++++++++-----------
   target/s390x/kvm.c            | 19 ++++++++-----------  

BTW: Is the original author of the code still around?

For the linux-user/s390x/target_cpu.h, it seems this code has been pushed by Alex Graf:

commit 10ec51174ca69a4c3c5149b0b3baaa6ccba66273

Author: Alexander Graf <[email protected]>
Date:   Sat Dec 5 12:44:21 2009 +0100

S/390 CPU fake emulation

Because Qemu currently requires a TCG target to exist and there are quite some useful helpers here to lay the groundwork for out KVM target, let's create a stub TCG emulation target for S390X CPUs.

This is required to make tcg happy. The emulation target itself won't work though.

Quoted 6 lines
Quoted 4 lines

But the "(c) 2009 Ulrich Hecht" is confusing.

Why? Ulrich was the one that started the port, I then cleaned it up, improved it, added system emulation and upstreamed it.

It's just a bit confusing that Ulrich does not show up in the sign-off chain.

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

What problem exactly are you trying to solve?

The confusing license statements?

I thought I'd ask whether the original author had any thoughts; if you think this patch is problematic, I can dequeue it again.

You can always combine LGPL and GPL code and the result becomes GPL only, so I see little problem? :)

That was the conclusion, I think :)

Acked-by on v1 1/1
#10 lore raw
In reply to Thomas Huth
Quoted 9 lines · Thomas Huth

The license information in these files is rather confusing. The text declares LGPL first, but then says that contributions after 2012 are licensed under the GPL instead. How should the average user who just downloaded the release tarball know which part is now GPL and which is LGPL?

Looking at the text of the LGPL (see COPYING.LIB in the top directory), the license clearly states how this should be done instead:

Quoted 8 lines

"3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License."

Thus let's clean up the confusing statements and use the proper GPL text only.

For the IBM-provided parts GPLv2+ is fine.

Quoted 146 lines
---
 linux-user/s390x/target_cpu.h | 19 ++++++++-----------
 target/s390x/cpu.c            | 19 ++++++++-----------
 target/s390x/cpu.h            | 19 ++++++++-----------
 target/s390x/kvm.c            | 19 ++++++++-----------
 4 files changed, 32 insertions(+), 44 deletions(-)
linux-user/s390x/target_cpu.h +8 -11
index 66ef8aa..aa181ce 100644
@@ -3,21 +3,18 @@
  *
  * Copyright (c) 2009 Ulrich Hecht
  *
- * 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.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * General Public License for more details.
  *
- * Contributions after 2012-10-29 are licensed under the terms of the
- * GNU GPL, version 2 or (at your option) any later version.
- *
- * You should have received a copy of the GNU (Lesser) General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef S390X_TARGET_CPU_H
 #define S390X_TARGET_CPU_H
target/s390x/cpu.c +8 -11
index 18ba7f8..698dd9c 100644
@@ -6,21 +6,18 @@
  * Copyright (c) 2012 SUSE LINUX Products GmbH
  * Copyright (c) 2012 IBM Corp.
  *
- * 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.1 of the License, or (at your option) any later version.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * General Public License for more details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see
- * <http://www.gnu.org/licenses/lgpl-2.1.html>
- * Contributions after 2012-12-11 are licensed under the terms of the
- * GNU GPL, version 2 or (at your option) any later version.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "qemu/osdep.h"
target/s390x/cpu.h +8 -11
index 47d2c2e..b71ac51 100644
@@ -4,21 +4,18 @@
  *  Copyright (c) 2009 Ulrich Hecht
  *  Copyright IBM Corp. 2012, 2018
  *
- * 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.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * General Public License for more details.
  *
- * Contributions after 2012-10-29 are licensed under the terms of the
- * GNU GPL, version 2 or (at your option) any later version.
- *
- * You should have received a copy of the GNU (Lesser) General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef S390X_CPU_H
target/s390x/kvm.c +8 -11
index 8613e19..9ff80c8 100644
@@ -4,21 +4,18 @@
  * Copyright (c) 2009 Alexander Graf <[email protected]>
  * Copyright IBM Corp. 2012
  *
- * 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.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
- * This library is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * General Public License for more details.
  *
- * Contributions after 2012-10-29 are licensed under the terms of the
- * GNU GPL, version 2 or (at your option) any later version.
- *
- * You should have received a copy of the GNU (Lesser) General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "qemu/osdep.h"
#11 lore raw
In reply to Thomas Huth
Quoted 18 lines · On Wed, 6 Feb 2019 13:41:33 +0100 Thomas Huth <[email protected]> wrote:

The license information in these files is rather confusing. The text declares LGPL first, but then says that contributions after 2012 are licensed under the GPL instead. How should the average user who just downloaded the release tarball know which part is now GPL and which is LGPL?

Looking at the text of the LGPL (see COPYING.LIB in the top directory), the license clearly states how this should be done instead:

"3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License."

Thus let's clean up the confusing statements and use the proper GPL text only.

Quoted 7 lines
---
 linux-user/s390x/target_cpu.h | 19 ++++++++-----------
 target/s390x/cpu.c            | 19 ++++++++-----------
 target/s390x/cpu.h            | 19 ++++++++-----------
 target/s390x/kvm.c            | 19 ++++++++-----------
 4 files changed, 32 insertions(+), 44 deletions(-)

Thanks, applied.