[PATCH-for-6.0] target/mips: Correct the license text

[PATCH-for-6.0] target/mips: Correct the license text

[Philippe Mathieu-Daudé]

The license is the 'GNU General Public License v2.0 or later',
not 'and':

  This program is free software; you can redistribute it and/ori
  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.

Fix the license comment.

Fixes: 3f7a927847a ("target/mips: LSA/DLSA R6 decodetree helpers")
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
Commit introduced after 5.2 release, during the 6.0 cycle.
Harmless and useful for 6.0-rc4 IMHO.
---
 target/mips/rel6_translate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/target/mips/rel6_translate.c b/target/mips/rel6_translate.c
index 139a7524eea..c5843cbc5e2 100644
--- a/target/mips/rel6_translate.c
+++ b/target/mips/rel6_translate.c
@@ -6,7 +6,7 @@
  *  Copyright (c) 2006 Thiemo Seufer (MIPS32R2 support)
  *  Copyright (c) 2020 Philippe Mathieu-Daudé
  *
- * This code is licensed under the GNU GPLv2 and later.
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
  */
 
 #include "qemu/osdep.h"
-- 
2.26.3

Re: [PATCH-for-6.0] target/mips: Correct the license text

[Peter Maydell]

On Sun, 18 Apr 2021 at 09:03, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> The license is the 'GNU General Public License v2.0 or later',
> not 'and':
>
>   This program is free software; you can redistribute it and/ori
>   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.
>
> Fix the license comment.
>
> Fixes: 3f7a927847a ("target/mips: LSA/DLSA R6 decodetree helpers")
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> Commit introduced after 5.2 release, during the 6.0 cycle.
> Harmless and useful for 6.0-rc4 IMHO.
> ---
>  target/mips/rel6_translate.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/target/mips/rel6_translate.c b/target/mips/rel6_translate.c
> index 139a7524eea..c5843cbc5e2 100644
> --- a/target/mips/rel6_translate.c
> +++ b/target/mips/rel6_translate.c
> @@ -6,7 +6,7 @@
>   *  Copyright (c) 2006 Thiemo Seufer (MIPS32R2 support)
>   *  Copyright (c) 2020 Philippe Mathieu-Daudé
>   *
> - * This code is licensed under the GNU GPLv2 and later.
> + * This work is licensed under the terms of the GNU GPL, version 2 or later.
>   */
>
>  #include "qemu/osdep.h"

I find this file's copyright/license comment a little confusing.
Looking at the actual commits, it seems to be entirely your work,
in which case you can put any (compatible) license you like on it.
But the comment header suggests it includes some code copied from
other files in target/mips and thus copyright by Thiemo and others:
if that's so then it would seem more logical that this file be
under the LGPL as older files like translate.c are.

thanks
-- PMM

Re: [PATCH-for-6.0] target/mips: Correct the license text

[Philippe Mathieu-Daudé]

On 4/19/21 6:53 PM, Peter Maydell wrote:
> On Sun, 18 Apr 2021 at 09:03, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>>
>> The license is the 'GNU General Public License v2.0 or later',
>> not 'and':
>>
>>   This program is free software; you can redistribute it and/ori
>>   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.
>>
>> Fix the license comment.
>>
>> Fixes: 3f7a927847a ("target/mips: LSA/DLSA R6 decodetree helpers")
>> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
>> ---
>> Commit introduced after 5.2 release, during the 6.0 cycle.
>> Harmless and useful for 6.0-rc4 IMHO.
>> ---
>>  target/mips/rel6_translate.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/target/mips/rel6_translate.c b/target/mips/rel6_translate.c
>> index 139a7524eea..c5843cbc5e2 100644
>> --- a/target/mips/rel6_translate.c
>> +++ b/target/mips/rel6_translate.c
>> @@ -6,7 +6,7 @@
>>   *  Copyright (c) 2006 Thiemo Seufer (MIPS32R2 support)
>>   *  Copyright (c) 2020 Philippe Mathieu-Daudé
>>   *
>> - * This code is licensed under the GNU GPLv2 and later.
>> + * This work is licensed under the terms of the GNU GPL, version 2 or later.
>>   */
>>
>>  #include "qemu/osdep.h"
> 
> I find this file's copyright/license comment a little confusing.
> Looking at the actual commits, it seems to be entirely your work,
> in which case you can put any (compatible) license you like on it.
> But the comment header suggests it includes some code copied from
> other files in target/mips and thus copyright by Thiemo and others:
> if that's so then it would seem more logical that this file be
> under the LGPL as older files like translate.c are.

I guess used a template with Thiemo and others by mistake, this file
is new and I wrote all the code content. I have no problem to change
it to LGPL.

Thanks,

Phil.