Skip to contentSkip to conversation

hw/isa/superio: Correct the license text

PATCH Applied Philippe Mathieu-Daudé 2 participants 2 messages Mar 12, 2020 – Mar 19, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw/isa/superio: Correct the license text

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.

---
 include/hw/isa/superio.h   | 2 +-
 hw/isa/isa-superio.c       | 2 +-
 hw/isa/smc37c669-superio.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
include/hw/isa/superio.h +1 -1
index b151dcd753..147cc0a7b7 100644
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2018 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.
  * See the COPYING file in the top-level directory.
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
hw/isa/isa-superio.c +1 -1
index c4e391916c..180a8b9625 100644
@@ -5,7 +5,7 @@
  * Copyright (c) 2011-2012 Andreas Färber
  * Copyright (c) 2018 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.
  * See the COPYING file in the top-level directory.
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
hw/isa/smc37c669-superio.c +1 -1
index 901a9f8e65..18287741cb 100644
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2018 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.
  * See the COPYING file in the top-level directory.
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
Signature · 1 line
2.21.1
#1 lore raw
Quoted 49 lines · 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.

---
 include/hw/isa/superio.h   | 2 +-
 hw/isa/isa-superio.c       | 2 +-
 hw/isa/smc37c669-superio.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
include/hw/isa/superio.h +1 -1
index b151dcd753..147cc0a7b7 100644
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2018 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.
  * See the COPYING file in the top-level directory.
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
hw/isa/isa-superio.c +1 -1
index c4e391916c..180a8b9625 100644
@@ -5,7 +5,7 @@
  * Copyright (c) 2011-2012 Andreas Färber
  * Copyright (c) 2018 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.
  * See the COPYING file in the top-level directory.
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
hw/isa/smc37c669-superio.c +0 -0
index 901a9f8e65..18287741cb 100644

hw/isa/smc37c669-superio.c line 9

Quoted 8 lines
hw/isa/smc37c669-superio.c +1 -1
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2018 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.
  * See the COPYING file in the top-level directory.
  * SPDX-License-Identifier: GPL-2.0-or-later
  */

Queued, thanks.

Paolo