Re: [Qemu-trivial] [Qemu-devel] [PATCH] hw/i2c/smbus_ich9: Fix the confusing contributions-after-2012 statement

[Markus Armbruster]

Cc: Marcel in the hope of getting a pong.

Thomas Huth <address@hidden> writes:

> On 29/03/2019 09.42, Thomas Huth wrote:
>> On 06/02/2019 17.43, Thomas Huth wrote:
>>> The license information in this file is rather confusing. The text
>>> declares LGPL first, but then says that contributions after Jan 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? Also, as far as I can see, the file has been added to
>>> QEMU *after* January in 2012, so the whole file should be GPL by
>>> default instead.
>>>
>>> Furthermore, looking at the text of the LGPL (see COPYING.LIB in the
>>> top directory), the license clearly states in section "3." that one
>>> should rather replace the license information in such a case instead.
>>> Thus let's clean up the confusing statements and use the proper GPL
>>> text only.
>>>
>>> While we're at it, also remove the comment about acpi.c, since that
>>> file does not exist under this name in the QEMU tree anymore.
>>>
>>> Signed-off-by: Thomas Huth <address@hidden>
>>> ---
>>>  hw/i2c/smbus_ich9.c | 21 ++++++++-------------
>>>  1 file changed, 8 insertions(+), 13 deletions(-)
>>>
>>> diff --git a/hw/i2c/smbus_ich9.c b/hw/i2c/smbus_ich9.c
>>> index 2a8b49e..484aef5 100644
>>> --- a/hw/i2c/smbus_ich9.c
>>> +++ b/hw/i2c/smbus_ich9.c
>>> @@ -6,23 +6,18 @@
>>>   *               VA Linux Systems Japan K.K.
>>>   * Copyright (C) 2012 Jason Baron <address@hidden>
>>>   *
>>> - * This is based on acpi.c, but heavily rewritten.
>>> + * 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 free software; you can redistribute it and/or
>>> - * modify it under the terms of the GNU Lesser General Public
>>> - * License version 2 as published by the Free Software Foundation.
>>> - *
>>> - * 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.
>>> - *
>>> - * 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/>
>>> - *
>>> - * Contributions after 2012-01-13 are licensed under the terms of the
>>> - * GNU GPL, version 2 or (at your option) any later version.
>>> + * General Public License for more details.
>>>   *
>>> + * 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"
>>>  #include "hw/hw.h"
>>>
>> 
>> Ping?
>
> Ping^2
>
>  Thomas