[Qemu-devel] [PATCH for-2.0] fw-path-provider: Change GPL version to 2+

[Qemu-devel] [PATCH for-2.0] fw-path-provider: Change GPL version to 2+

[Alexey Kardashevskiy]

Cc: Andreas Färber <afaerber@suse.de>
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---

Guys, did you mean just this or there is something more?
Should all new files use this 2.0+ now? I have a couple like this coming.
Thanks!


---
 hw/core/fw-path-provider.c    | 2 +-
 include/hw/fw-path-provider.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/core/fw-path-provider.c b/hw/core/fw-path-provider.c
index b117157..62a0bff 100644
--- a/hw/core/fw-path-provider.c
+++ b/hw/core/fw-path-provider.c
@@ -3,7 +3,7 @@
  *
  *  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; under version 2 of the License.
+ *  the Free Software Foundation; under version 2.0+ of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/hw/fw-path-provider.h b/include/hw/fw-path-provider.h
index 3018349..c7dcae6 100644
--- a/include/hw/fw-path-provider.h
+++ b/include/hw/fw-path-provider.h
@@ -3,7 +3,7 @@
  *
  *  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; under version 2 of the License.
+ *  the Free Software Foundation; under version 2.0+ of the License.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-- 
1.8.4.rc4

Re: [Qemu-devel] [PATCH for-2.0] fw-path-provider: Change GPL version to 2+

[Paolo Bonzini]

Il 26/03/2014 15:00, Alexey Kardashevskiy ha scritto:
> Cc: Andreas Färber <afaerber@suse.de>
> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> ---
>
> Guys, did you mean just this or there is something more?

The recommended phrasing is

- *  the Free Software Foundation; under version 2 of the License.
+ *  the Free Software Foundation; under version 2 of the License
+ *  or (at your option) any later version.

> Should all new files use this 2.0+ now? I have a couple like this coming.

Yes.

Anyway,

Acked-by: Paolo Bonzini <pbonzini@redhat.com>

> Thanks!
>
>
> ---
>  hw/core/fw-path-provider.c    | 2 +-
>  include/hw/fw-path-provider.h | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/core/fw-path-provider.c b/hw/core/fw-path-provider.c
> index b117157..62a0bff 100644
> --- a/hw/core/fw-path-provider.c
> +++ b/hw/core/fw-path-provider.c
> @@ -3,7 +3,7 @@
>   *
>   *  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; under version 2 of the License.
> + *  the Free Software Foundation; under version 2.0+ of the License.
>   *
>   *  This program is distributed in the hope that it will be useful,
>   *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> diff --git a/include/hw/fw-path-provider.h b/include/hw/fw-path-provider.h
> index 3018349..c7dcae6 100644
> --- a/include/hw/fw-path-provider.h
> +++ b/include/hw/fw-path-provider.h
> @@ -3,7 +3,7 @@
>   *
>   *  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; under version 2 of the License.
> + *  the Free Software Foundation; under version 2.0+ of the License.
>   *
>   *  This program is distributed in the hope that it will be useful,
>   *  but WITHOUT ANY WARRANTY; without even the implied warranty of
>

Re: [Qemu-devel] [PATCH for-2.0] fw-path-provider: Change GPL version to 2+

[Andreas Färber]

Hi Alexey,

Am 26.03.2014 15:00, schrieb Alexey Kardashevskiy:
> Cc: Andreas Färber <afaerber@suse.de>
> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> ---
> 
> Guys, did you mean just this or there is something more?

The usual text is "either version 2 of the License, or (at your option)
any later version" - compare http://opensource.org/licenses/GPL-2.0

> Should all new files use this 2.0+ now? I have a couple like this coming.

Yes, please. See http://wiki.qemu.org/Relicensing for some background
and previous work. Reasons restricting use of GPL-2.0+ include code
copied from Linux that is licensed under that GPL-2.0-only version.

> Thanks!

Thanks for following up on this.

Cheers,
Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

[Qemu-devel] [PATCH for-2.0 v2] fw-path-provider: Change GPL version to 2+

[Alexey Kardashevskiy]

Cc: Andreas Färber <afaerber@suse.de>
Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
---

Changes:
v2:
* corrected text 


---
 hw/core/fw-path-provider.c    | 3 ++-
 include/hw/fw-path-provider.h | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hw/core/fw-path-provider.c b/hw/core/fw-path-provider.c
index b117157..d4f1a9d 100644
--- a/hw/core/fw-path-provider.c
+++ b/hw/core/fw-path-provider.c
@@ -3,7 +3,8 @@
  *
  *  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; under version 2 of the License.
+ *  the Free Software Foundation; under version 2 of the License
+ *  or (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/include/hw/fw-path-provider.h b/include/hw/fw-path-provider.h
index 3018349..6ce9d7c 100644
--- a/include/hw/fw-path-provider.h
+++ b/include/hw/fw-path-provider.h
@@ -3,7 +3,8 @@
  *
  *  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; under version 2 of the License.
+ *  the Free Software Foundation; under version 2 of the License
+ *  or (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-- 
1.8.4.rc4

Re: [Qemu-devel] [PATCH for-2.0 v2] fw-path-provider: Change GPL version to 2+

[Alexey Kardashevskiy]

On 03/27/2014 01:13 AM, Alexey Kardashevskiy wrote:
> Cc: Andreas Färber <afaerber@suse.de>
> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>

Ah, this one is missing "suggested-by". And Paolo's "sob". Posting patches
is tough :)


> ---
> 
> Changes:
> v2:
> * corrected text 
> 
> 
> ---
>  hw/core/fw-path-provider.c    | 3 ++-
>  include/hw/fw-path-provider.h | 3 ++-
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/core/fw-path-provider.c b/hw/core/fw-path-provider.c
> index b117157..d4f1a9d 100644
> --- a/hw/core/fw-path-provider.c
> +++ b/hw/core/fw-path-provider.c
> @@ -3,7 +3,8 @@
>   *
>   *  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; under version 2 of the License.
> + *  the Free Software Foundation; under version 2 of the License
> + *  or (at your option) any later version.
>   *
>   *  This program is distributed in the hope that it will be useful,
>   *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> diff --git a/include/hw/fw-path-provider.h b/include/hw/fw-path-provider.h
> index 3018349..6ce9d7c 100644
> --- a/include/hw/fw-path-provider.h
> +++ b/include/hw/fw-path-provider.h
> @@ -3,7 +3,8 @@
>   *
>   *  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; under version 2 of the License.
> + *  the Free Software Foundation; under version 2 of the License
> + *  or (at your option) any later version.
>   *
>   *  This program is distributed in the hope that it will be useful,
>   *  but WITHOUT ANY WARRANTY; without even the implied warranty of
> 


-- 
Alexey

Re: [Qemu-devel] [PATCH for-2.0 v2] fw-path-provider: Change GPL version to 2+

[Andreas Färber]

Am 26.03.2014 15:19, schrieb Alexey Kardashevskiy:
> On 03/27/2014 01:13 AM, Alexey Kardashevskiy wrote:
>> Cc: Andreas Färber <afaerber@suse.de>
>> Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru>
> 
> Ah, this one is missing "suggested-by". And Paolo's "sob". Posting patches
> is tough :)
> 
> 
>> ---
>>
>> Changes:
>> v2:
>> * corrected text 

Sorry, patch slipped through. I've transferred Paolo's Acked-by from v1
and tweaked the wording to match that at:
https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html

Thanks, applied to qom-next:
https://github.com/afaerber/qemu-cpu/commits/qom-next

Pull coming up shortly.

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg