Skip to contentSkip to conversation

Replace FSF postal address with licenses URL

PATCH In review Sean Wei 7 participants 38 messages Jun 13, 2025 – Jun 25, 2025

Subsystems (3)
lore
Share & tools
lore

Sean Wei

author
#0 lore raw

cover Replace FSF postal address with licenses URL

The boiler-plate licence headers in several parts of QEMU still contain the obsolete “51 Franklin Street" contact line.

The Free Software Foundation now recommends using the canonical URL:

https://www.gnu.org/licenses/

This patch updates those headers. The patches are comment-only; no source code changes.

Please review and let me know if any patch should be split, squashed or dropped. This is my first patch for the QEMU project, so any feedback is greatly appreciated.

Thanks to Thomas Huth <[email protected]> for proposing this issue and outlining the steps, and to Daniel P. Berrangé <[email protected]> for the clarifications.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2438

--

Sean Wei (12):
COPYING: replace FSF postal address with licenses URL
linux-headers: replace FSF postal address with licenses URL
libdecnumber: replace FSF postal address with licenses URL include/libdecnumber: replace FSF postal address with licenses URL include/hw: replace FSF postal address with licenses URL include/qemu: replace FSF postal address with licenses URL util/rcu.c: replace FSF postal address with licenses URL
hw: replace FSF postal address with licenses URL
scripts: replace FSF postal address with licenses URL
contrib: replace FSF postal address with licenses URL target/xtensa: replace FSF postal address with licenses URL target/i386/emulate: replace FSF postal address with licenses URL

 COPYING                                        | 5 ++---
 COPYING.LIB                                    | 5 ++---
 contrib/elf2dmp/pdb.c                          | 4 ++--
 hw/net/vmxnet3.h                               | 4 ++--
 hw/scsi/vmw_pvscsi.h                           | 4 ++--
 include/hw/i2c/aspeed_i2c.h                    | 3 +--
 include/hw/pci/pci_bridge.h                    | 4 ++--
 include/hw/timer/aspeed_timer.h                | 3 +--
 include/libdecnumber/dconfig.h                 | 5 ++---
 include/libdecnumber/decContext.h              | 5 ++---
 include/libdecnumber/decDPD.h                  | 5 ++---
 include/libdecnumber/decNumber.h               | 5 ++---
 include/libdecnumber/decNumberLocal.h          | 5 ++---
 include/libdecnumber/dpd/decimal128.h          | 5 ++---
 include/libdecnumber/dpd/decimal128Local.h     | 5 ++---
 include/libdecnumber/dpd/decimal32.h           | 5 ++---
 include/libdecnumber/dpd/decimal64.h           | 5 ++---
 include/qemu/rcu.h                             | 4 ++--
 include/qemu/rcu_queue.h                       | 4 ++--
 libdecnumber/decContext.c                      | 5 ++---
 libdecnumber/decNumber.c                       | 5 ++---
 libdecnumber/dpd/decimal128.c                  | 5 ++---
 libdecnumber/dpd/decimal32.c                   | 5 ++---
 libdecnumber/dpd/decimal64.c                   | 5 ++---
 linux-headers/LICENSES/preferred/GPL-2.0       | 5 ++---
 linux-headers/asm-arm/kvm.h                    | 4 ++--
 linux-headers/asm-powerpc/kvm.h                | 4 ++--
 scripts/device-crash-test                      | 3 +--
 target/i386/emulate/x86_emu.c                  | 4 ++--
 target/i386/emulate/x86_flags.c                | 4 ++--
 target/i386/emulate/x86_flags.h                | 4 ++--
 target/xtensa/core-dc232b/gdb-config.c.inc     | 5 ++---
 target/xtensa/core-dc232b/xtensa-modules.c.inc | 5 ++---
 target/xtensa/core-fsf/xtensa-modules.c.inc    | 5 ++---
 util/rcu.c                                     | 4 ++--
 35 files changed, 67 insertions(+), 90 deletions(-)
Signature · 1 line
2.49.0
author
#1 lore raw

PATCH 1/12 COPYING: replace FSF postal address with licenses URL

The license text in COPYING (GPLv2), COPYING.LIB (LGPLv2.1), and the linux-headers/LICENSES/preferred/GPL-2.0 file are referenced to the obsolete FSF postal address.

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

---
 COPYING                                  | 5 ++---
 COPYING.LIB                              | 5 ++---
 linux-headers/LICENSES/preferred/GPL-2.0 | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)
COPYING +2 -3
index 00ccfbb628..8095135d50 100644
@@ -2,7 +2,7 @@
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -304,8 +304,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    with this program; if not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
COPYING.LIB +2 -3
index 4362b49151..99f47575b5 100644
@@ -2,7 +2,7 @@
                        Version 2.1, February 1999
 
  Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -484,8 +484,7 @@ convey the exclusion of warranty; and each file should have at least the
     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, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+    License along with this library; if not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
linux-headers/LICENSES/preferred/GPL-2.0 +2 -3
index ff0812fd89..10248a619e 100644
@@ -21,7 +21,7 @@ License-Text:
 		       Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -323,8 +323,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+    along with this program; if not, see <https://www.gnu.org/licenses/>.
 
 
 Also add information on how to contact you by electronic and paper mail.
Signature · 1 line
2.49.0
author
#3 lore raw

PATCH 2/12 linux-headers: replace FSF postal address with licenses URL

In reply to Sean Wei

The GPLv2 boiler-plate in asm-arm/kvm.h and asm-powerpc/kvm.h still contained the obsolete "51 Franklin Street" postal address.

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

---
 linux-headers/asm-arm/kvm.h     | 4 ++--
 linux-headers/asm-powerpc/kvm.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
linux-headers/asm-arm/kvm.h +2 -2
index 0db5644e27..a8bb1aa42a 100644
@@ -13,8 +13,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * along with this program; if not, see
+ * <https://www.gnu.org/licenses/>.
  */
 
 #ifndef __ARM_KVM_H__
linux-headers/asm-powerpc/kvm.h +2 -2
index eaeda00178..83faa7fae3 100644
@@ -10,8 +10,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * along with this program; if not, see
+ * <https://www.gnu.org/licenses/>.
  *
  * Copyright IBM Corp. 2007
  *
Signature · 1 line
2.49.0
author
#5 lore raw

PATCH 3/12 libdecnumber: replace FSF postal address with licenses URL

In reply to Sean Wei

Some of the GPLv2 boiler-plate still contained the obsolete "51 Franklin Street" postal address.

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

---
 libdecnumber/decContext.c     | 5 ++---
 libdecnumber/decNumber.c      | 5 ++---
 libdecnumber/dpd/decimal128.c | 5 ++---
 libdecnumber/dpd/decimal32.c  | 5 ++---
 libdecnumber/dpd/decimal64.c  | 5 ++---
 5 files changed, 10 insertions(+), 15 deletions(-)
libdecnumber/decContext.c +2 -3
index 1956edf0a7..d99b08026c 100644
@@ -24,9 +24,8 @@
    for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   along with GCC; see the file COPYING.  If not, see
+   <https://www.gnu.org/licenses/>.  */
 
 /* ------------------------------------------------------------------ */
 /* Decimal Context module					      */
libdecnumber/decNumber.c +2 -3
index 31282adafd..4b57d8a6fe 100644
@@ -24,9 +24,8 @@
    for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   along with GCC; see the file COPYING.  If not, see
+   <https://www.gnu.org/licenses/>.  */
 
 /* ------------------------------------------------------------------ */
 /* Decimal Number arithmetic module				      */
libdecnumber/dpd/decimal128.c +2 -3
index ca4764e547..1064fb25e0 100644
@@ -24,9 +24,8 @@
    for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   along with GCC; see the file COPYING.  If not, see
+   <https://www.gnu.org/licenses/>.  */
 
 /* ------------------------------------------------------------------ */
 /* Decimal 128-bit format module				      */
libdecnumber/dpd/decimal32.c +2 -3
index 53f29789d7..34ff0fe959 100644
@@ -24,9 +24,8 @@
    for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   along with GCC; see the file COPYING.  If not, see
+   <https://www.gnu.org/licenses/>.  */
 
 /* ------------------------------------------------------------------ */
 /* Decimal 32-bit format module					      */
libdecnumber/dpd/decimal64.c +2 -3
index 290dbe8177..11e0674fa7 100644
@@ -24,9 +24,8 @@
    for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   along with GCC; see the file COPYING.  If not, see
+   <https://www.gnu.org/licenses/>.  */
 
 /* ------------------------------------------------------------------ */
 /* Decimal 64-bit format module					      */
Signature · 1 line
2.49.0
author
#7 lore raw

PATCH 4/12 include/libdecnumber: replace FSF postal address with licenses URL

In reply to Sean Wei

Some of the GPLv2 boiler-plate still contained the obsolete "51 Franklin Street" postal address.

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

---
 include/libdecnumber/dconfig.h             | 5 ++---
 include/libdecnumber/decContext.h          | 5 ++---
 include/libdecnumber/decDPD.h              | 5 ++---
 include/libdecnumber/decNumber.h           | 5 ++---
 include/libdecnumber/decNumberLocal.h      | 5 ++---
 include/libdecnumber/dpd/decimal128.h      | 5 ++---
 include/libdecnumber/dpd/decimal128Local.h | 5 ++---
 include/libdecnumber/dpd/decimal32.h       | 5 ++---
 include/libdecnumber/dpd/decimal64.h       | 5 ++---
 9 files changed, 18 insertions(+), 27 deletions(-)
include/libdecnumber/dconfig.h +2 -3
index 2bc0ba7f14..e67ecc1b5f 100644
@@ -23,9 +23,8 @@
    for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   along with GCC; see the file COPYING.  If not, see
+   <https://www.gnu.org/licenses/>.  */
 
 
 #if HOST_BIG_ENDIAN
include/libdecnumber/decContext.h +2 -3
index cea6e4279e..5bb64e1332 100644
@@ -24,9 +24,8 @@
    for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   along with GCC; see the file COPYING.  If not, see
+   <https://www.gnu.org/licenses/>.  */
 
 /* ------------------------------------------------------------------ */
 /* Decimal Context module header				      */
include/libdecnumber/decDPD.h +2 -3
index 26a21ec8ed..8eb455277b 100644
@@ -24,9 +24,8 @@
    for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   along with GCC; see the file COPYING.  If not, see
+   <https://www.gnu.org/licenses/>.  */
 
 /* ------------------------------------------------------------------------ */
 /* Binary Coded Decimal and Densely Packed Decimal conversion lookup tables */
include/libdecnumber/decNumber.h +2 -3
index 41bc2a0d36..bf37af83e6 100644
@@ -24,9 +24,8 @@
    for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   along with GCC; see the file COPYING.  If not, see
+   <https://www.gnu.org/licenses/>.  */
 
 /* ------------------------------------------------------------------ */
 /* Decimal Number arithmetic module header			      */
include/libdecnumber/decNumberLocal.h +2 -3
index 6198ca8593..0959f6606b 100644
@@ -24,9 +24,8 @@
    for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   along with GCC; see the file COPYING.  If not, see
+   <https://www.gnu.org/licenses/>.  */
 
 /* ------------------------------------------------------------------ */
 /* decNumber package local type, tuning, and macro definitions	      */
include/libdecnumber/dpd/decimal128.h +2 -3
index aff261e556..c57180baf8 100644
@@ -24,9 +24,8 @@
    for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   along with GCC; see the file COPYING.  If not, see
+   <https://www.gnu.org/licenses/>.  */
 
 /* ------------------------------------------------------------------ */
 /* Decimal 128-bit format module header				      */
include/libdecnumber/dpd/decimal128Local.h +2 -3
index 9765427719..2948ab2534 100644
@@ -23,9 +23,8 @@
    for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   along with GCC; see the file COPYING.  If not, see
+   <https://www.gnu.org/licenses/>.  */
 
 #if !defined(DECIMAL128LOCAL)
 
include/libdecnumber/dpd/decimal32.h +2 -3
index 6cb9e43620..9a17933497 100644
@@ -24,9 +24,8 @@
    for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   along with GCC; see the file COPYING.  If not, see
+   <https://www.gnu.org/licenses/>.  */
 
 /* ------------------------------------------------------------------ */
 /* Decimal 32-bit format module header				      */
include/libdecnumber/dpd/decimal64.h +2 -3
index f29e57064d..5c3d0bb43c 100644
@@ -24,9 +24,8 @@
    for more details.
 
    You should have received a copy of the GNU General Public License
-   along with GCC; see the file COPYING.  If not, write to the Free
-   Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   along with GCC; see the file COPYING.  If not, see
+   <https://www.gnu.org/licenses/>.  */
 
 /* ------------------------------------------------------------------ */
 /* Decimal 64-bit format module header				      */
Signature · 1 line
2.49.0
author
#9 lore raw

PATCH 5/12 include/hw: replace FSF postal address with licenses URL

In reply to Sean Wei

Some of the GPLv2 boiler-plate still contained the obsolete "51 Franklin Street" postal address.

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

---
 include/hw/i2c/aspeed_i2c.h     | 3 +--
 include/hw/pci/pci_bridge.h     | 4 ++--
 include/hw/timer/aspeed_timer.h | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)
include/hw/i2c/aspeed_i2c.h +1 -2
index 2c4c81bd20..2daacc10ce 100644
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  with this program; if not, see <https://www.gnu.org/licenses/>.
  */
 
 #ifndef ASPEED_I2C_H
include/hw/pci/pci_bridge.h +2 -2
index b0f5204d80..8cdacbc4e1 100644
@@ -14,8 +14,8 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * along with this program; if not, see
+ * <https://www.gnu.org/licenses/>.
  *
  * split out pci bus specific stuff from pci.[hc] to pci_bridge.[hc]
  * Copyright (c) 2009 Isaku Yamahata <yamahata at valinux co jp>
include/hw/timer/aspeed_timer.h +1 -2
index 767cae4b05..a850625a05 100644
@@ -16,8 +16,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  with this program; if not, see <https://www.gnu.org/licenses/>.
  */
 #ifndef ASPEED_TIMER_H
 #define ASPEED_TIMER_H
Signature · 1 line
2.49.0
author
#23 lore raw

PATCH 6/12 include/qemu: replace FSF postal address with licenses URL

In reply to Sean Wei

The LGPLv2.1 boiler-plate in rcu.h and rcu_queue.h still contained the obsolete "51 Franklin Street" postal address.

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

---
 include/qemu/rcu.h       | 4 ++--
 include/qemu/rcu_queue.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
include/qemu/rcu.h +2 -2
index fea058aa9f..020dbe4d8b 100644
@@ -17,8 +17,8 @@
  * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * License along with this library; if not, see
+ * <https://www.gnu.org/licenses/>.
  *
  * IBM's contributions to this file may be relicensed under LGPLv2 or later.
  */
include/qemu/rcu_queue.h +2 -2
index 4e6298d473..bfd5900fda 100644
@@ -17,8 +17,8 @@
  * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * License along with this library; if not, see
+ * <https://www.gnu.org/licenses/>.
  *
  * Copyright (c) 2013 Mike D. Day, IBM Corporation.
  *
Signature · 1 line
2.49.0
author
#25 lore raw

PATCH 7/12 util/rcu.c: replace FSF postal address with licenses URL

In reply to Sean Wei

The LGPLv2.1 boiler-plate in util/rcu.c still contained the obsolete "51 Franklin Street" postal address.

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

---
 util/rcu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
util/rcu.c +2 -2
index fa32c942e4..b703c86f15 100644
@@ -20,8 +20,8 @@
  * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * License along with this library; if not, see
+ * <https://www.gnu.org/licenses/>.
  *
  * IBM's contributions to this file may be relicensed under LGPLv2 or later.
  */
Signature · 1 line
2.49.0
author
#27 lore raw

PATCH 8/12 hw: replace FSF postal address with licenses URL

In reply to Sean Wei

The GPLv2 boiler-plate in vmxnet3.h and vmw_pvscsi.h still contained the obsolete "51 Franklin Street" postal address.

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

---
 hw/net/vmxnet3.h     | 4 ++--
 hw/scsi/vmw_pvscsi.h | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
hw/net/vmxnet3.h +2 -2
index f9283f9e7b..dbc69d5fb6 100644
@@ -63,8 +63,8 @@
  * details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * along with this program; if not, see
+ * <https://www.gnu.org/licenses/>.
  *
  * The full GNU General Public License is included in this distribution in
  * the file called "COPYING".
hw/scsi/vmw_pvscsi.h +2 -2
index 17fcf66273..a3ae517e19 100644
@@ -14,8 +14,8 @@
  * details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ * along with this program; if not, see
+ * <https://www.gnu.org/licenses/>.
  *
  * Maintained by: Arvind Kumar <[email protected]>
  *
Signature · 1 line
2.49.0
author
#29 lore raw

PATCH 9/12 scripts: replace FSF postal address with licenses URL

In reply to Sean Wei

The GPLv2 boiler-plate in scripts/device-crash-test still contained the obsolete "51 Franklin Street" postal address.

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

---
 scripts/device-crash-test | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
scripts/device-crash-test +1 -2
index da8b56edd9..1ecb9663ae 100755
@@ -16,8 +16,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# with this program; if not, see <https://www.gnu.org/licenses/>.
 
 """
 Run QEMU with all combinations of -machine and -device types,
Signature · 1 line
2.49.0
author
#31 lore raw

PATCH 10/12 contrib: replace FSF postal address with licenses URL

In reply to Sean Wei

The LGPLv2.1 boiler-plate in pdb.c file still contained the obsolete "51 Franklin Street" postal address.

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

---
 contrib/elf2dmp/pdb.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
contrib/elf2dmp/pdb.c +2 -2
index 492aca4434..47c5126fb8 100644
@@ -14,8 +14,8 @@
  * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ * License along with this library; if not, see
+ * <https://www.gnu.org/licenses/>.
  */
 
 #include "qemu/osdep.h"
Signature · 1 line
2.49.0
author
#33 lore raw

PATCH 11/12 target/xtensa: replace FSF postal address with licenses URL

In reply to Sean Wei

Some of the GPLv2 boiler-plate still contained the obsolete "51 Franklin Street" postal address.

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

---
 target/xtensa/core-dc232b/gdb-config.c.inc     | 5 ++---
 target/xtensa/core-dc232b/xtensa-modules.c.inc | 5 ++---
 target/xtensa/core-fsf/xtensa-modules.c.inc    | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)
target/xtensa/core-dc232b/gdb-config.c.inc +2 -3
index d87168628b..8c88caef59 100644
@@ -15,9 +15,8 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program; if not, see
+   <https://www.gnu.org/licenses/>.  */
 
   XTREG(0,   0, 32, 4, 4, 0x0020, 0x0006, -2, 9, 0x0100, pc,
           0, 0, 0, 0, 0, 0)
target/xtensa/core-dc232b/xtensa-modules.c.inc +2 -3
index 164df3b1a4..bb9ebd24b8 100644
@@ -14,9 +14,8 @@
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   along with this program; if not, see
+   <https://www.gnu.org/licenses/>.  */
 
 #include "qemu/osdep.h"
 #include "xtensa-isa.h"
target/xtensa/core-fsf/xtensa-modules.c.inc +2 -3
index c32683ff77..531f5e2b7e 100644
@@ -14,9 +14,8 @@
    General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-   02110-1301, USA.  */
+   along with this program; if not, see
+   <https://www.gnu.org/licenses/>.  */
 
 #include "qemu/osdep.h"
 #include "xtensa-isa.h"
Signature · 1 line
2.49.0
author
#35 lore raw

PATCH 12/12 target/i386/emulate: replace FSF postal address with licenses URL

In reply to Sean Wei

Some of the LGPLv2.1 boiler-plate still contained the obsolete "51 Franklin Street" postal address.

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

---
 target/i386/emulate/x86_emu.c   | 4 ++--
 target/i386/emulate/x86_flags.c | 4 ++--
 target/i386/emulate/x86_flags.h | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
target/i386/emulate/x86_emu.c +2 -2
index 4890e0a4e5..db7a7f7437 100644
@@ -31,8 +31,8 @@
 //  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, write to the Free Software
-//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA B 02110-1301 USA
+//  License along with this library; if not, see
+//  <https://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////
 
 #include "qemu/osdep.h"
target/i386/emulate/x86_flags.c +2 -2
index cc138c7749..6592193b5e 100644
@@ -14,8 +14,8 @@
 //  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, write to the Free Software
-//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA B 02110-1301 USA
+//  License along with this library; if not, see
+//  <https://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////
 /*
  * flags functions
target/i386/emulate/x86_flags.h +2 -2
index 28b008e577..a395c837a0 100644
@@ -14,8 +14,8 @@
 //  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, write to the Free Software
-//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA B 02110-1301 USA
+//  License along with this library; if not, see
+//  <https://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////
 /*
  * x86 eflags functions
Signature · 1 line
2.49.0
Acked-by on v1 11/12
#34 lore raw

Re: [PATCH 11/12] target/xtensa: replace FSF postal address with licenses URL

In reply to Sean Wei
Quoted 7 lines · Sean Wei

Some of the GPLv2 boiler-plate still contained the obsolete "51 Franklin Street" postal address.

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

Quoted 6 lines
---
 target/xtensa/core-dc232b/gdb-config.c.inc     | 5 ++---
 target/xtensa/core-dc232b/xtensa-modules.c.inc | 5 ++---
 target/xtensa/core-fsf/xtensa-modules.c.inc    | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)
Signature · 2 lines
Thanks.
-- Max
#10 lore raw

Re: [PATCH 05/12] include/hw: replace FSF postal address with licenses URL

In reply to Sean Wei

Hello Sean,

Quoted 7 lines · Sean Wei

Some of the GPLv2 boiler-plate still contained the obsolete "51 Franklin Street" postal address.

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

Instead, I would remove the license boiler plate and add :

SPDX-License-Identifier: GPL-2.0-or-later

Thanks,

C.

Quoted 49 lines
---
  include/hw/i2c/aspeed_i2c.h     | 3 +--
  include/hw/pci/pci_bridge.h     | 4 ++--
  include/hw/timer/aspeed_timer.h | 3 +--
  3 files changed, 4 insertions(+), 6 deletions(-)
include/hw/i2c/aspeed_i2c.h +1 -2
index 2c4c81bd20..2daacc10ce 100644
@@ -14,8 +14,7 @@
   *  GNU General Public License for more details.
   *
   *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  with this program; if not, see <https://www.gnu.org/licenses/>.
   */
 
  #ifndef ASPEED_I2C_H
include/hw/pci/pci_bridge.h +2 -2
index b0f5204d80..8cdacbc4e1 100644
@@ -14,8 +14,8 @@
   * GNU General Public License for more details.
   *
   * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * along with this program; if not, see
+ * <https://www.gnu.org/licenses/>.
   *
   * split out pci bus specific stuff from pci.[hc] to pci_bridge.[hc]
   * Copyright (c) 2009 Isaku Yamahata <yamahata at valinux co jp>
include/hw/timer/aspeed_timer.h +1 -2
index 767cae4b05..a850625a05 100644
@@ -16,8 +16,7 @@
   *  GNU General Public License for more details.
   *
   *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  with this program; if not, see <https://www.gnu.org/licenses/>.
   */
  #ifndef ASPEED_TIMER_H
  #define ASPEED_TIMER_H
author
#11 lore raw

Re: [PATCH 05/12] include/hw: replace FSF postal address with licenses URL

Hi Cédric,

Thank you for the quick review and for suggesting the SPDX approach.

Quoted 5 lines · Cédric Le Goater

Instead, I would remove the license boiler plate and add :

SPDX-License-Identifier: GPL-2.0-or-later

Before we respin the patch, could you please confirm the scope below?

1. For the two headers currently under review
(aspeed_i2c.h and aspeed_timer.h)

I will drop the multi-line GPL boiler-plate and replace it with SPDX line, while keeping the copyright statements.

2. For the other ASPEED-maintained files

       hw/*/*aspeed*
       include/hw/*/*aspeed*
       tests/*/*aspeed*

Would you prefer to convert them as well? If so, I'd prefer to send a dedicated patch series after this one.

3. Replacement rule:

* multi-line GPL boiler-plate

     -> replace with SPDX

* existing short two-line notice
This code is licensed under the GPL version 2 or later. See the COPYING file in the top-level directory.
-> leave unchanged

Is that correct?

4. If we do the wider sweep,
should MIT-licensed ASPEED files also be updated by replacing their boiler-plate with SPDX identifier in the same patch series?

Please let me know what works best for you and I will send v2 accordingly.

Thanks again for the guidance,
Sean Wei

#12 lore raw

Re: [PATCH 05/12] include/hw: replace FSF postal address with licenses URL

Hello Sean,

+ Daniel

Quoted 11 lines · Sean Wei

Hi Cédric,

Thank you for the quick review and for suggesting the SPDX approach.

Quoted 5 lines · Cédric Le Goater

Instead, I would remove the license boiler plate and add :

SPDX-License-Identifier: GPL-2.0-or-later

Quoted 8 lines

Before we respin the patch, could you please confirm the scope below?

1. For the two headers currently under review
(aspeed_i2c.h and aspeed_timer.h)

I will drop the multi-line GPL boiler-plate and replace it with SPDX line, while keeping the copyright statements.

Fine with me.

Quoted 8 lines

2. For the other ASPEED-maintained files

        hw/*/*aspeed*
        include/hw/*/*aspeed*
        tests/*/*aspeed*

    Would you prefer to convert them as well? If so, I'd prefer to
    send a dedicated patch series after this one.

OK. As you wish.

I think you can convert all QEMU files while at it. See:

https://lore.kernel.org/qemu-devel/[email protected]/

Quoted 9 lines

3. Replacement rule:

* multi-line GPL boiler-plate
-> replace with SPDX

* existing short two-line notice
This code is licensed under the GPL version 2 or later. See the COPYING file in the top-level directory.
-> leave unchanged

Please replace with SPDX too.

Quoted 5 lines

Is that correct?

4. If we do the wider sweep,
should MIT-licensed ASPEED files also be updated by replacing

Are there any ?

Thanks,

C.

Quoted 7 lines

their boiler-plate with SPDX identifier in the same patch series?

Please let me know what works best for you and I will send v2 accordingly.

Thanks again for the guidance,
Sean Wei

author
#13 lore raw

Re: [PATCH 05/12] include/hw: replace FSF postal address with licenses URL

Hi Cédric,

Thanks for pointing me to the earlier thread, moving to the SPDX-License-Identifier tags is the better long-term fix.

Quoted 1 line

I think you can convert all QEMU files while at it.

To keep traffic on qemu-devel@ manageable, I'd like to work subtree by subtree, following the sections in MAINTAINERS.

Quoted 1 line

Are there any MIT-licensed files?

Just a handful in the ASPEED code base using MIT:

hw/ssi/aspeed_smc.c
include/hw/ssi/aspeed_smc.h
tests/qtest/aspeed_gpio-test.c
tests/qtest/aspeed_smc-test.c
tests/qtest/aspeed-smc-utils.c
tests/qtest/aspeed-smc-utils.h

## Proposed steps

1. Start with the ASPEED BMC subtree.

2. Split commits by path and header style.
path: hw/, include/hw/, tests/
license: GPL-2.0-or-later, GPL-2.0-only, MIT
style: boiler plate, see COPYING

3. Drop the boiler-plate, replace with the correct SPDX-License-Identifier, without changing code.

Does this approach sound reasonable for you?

Thanks again for the guidance!

Best regards,
Sean Wei

#14 lore raw

Re: [PATCH 05/12] include/hw: replace FSF postal address with licenses URL

Hello Sean

Quoted 14 lines · Sean Wei

Hi Cédric,

Thanks for pointing me to the earlier thread, moving to the SPDX-License-Identifier tags is the better long-term fix.

Quoted 1 line

I think you can convert all QEMU files while at it.

To keep traffic on qemu-devel@ manageable, I'd like to work subtree by subtree, following the sections in MAINTAINERS.

Quoted 1 line

Are there any MIT-licensed files?

Quoted 8 lines

Just a handful in the ASPEED code base using MIT:

    hw/ssi/aspeed_smc.c
    include/hw/ssi/aspeed_smc.h
    tests/qtest/aspeed_gpio-test.c
    tests/qtest/aspeed_smc-test.c
    tests/qtest/aspeed-smc-utils.c
    tests/qtest/aspeed-smc-utils.h

Oh and I am the one that did that 9y ago. I think I was inspired by the PPC series source files I was working on at the time.

Quoted 5 lines

## Proposed steps

1. Start with the ASPEED BMC subtree.

Quoted 8 lines

2. Split commits by path and header style.
   path: hw/, include/hw/, tests/
   license: GPL-2.0-or-later, GPL-2.0-only, MIT
   style: boiler plate, see COPYING

Quoted 1 line

3. Drop the boiler-plate, replace with the correct

   SPDX-License-Identifier, without changing code.

Does this approach sound reasonable for you?

LGTM. I will merge these changes through the aspeed tree.

Thanks,

C.

#15 lore raw

Re: [PATCH 05/12] include/hw: replace FSF postal address with licenses URL

In reply to Cédric Le Goater
Quoted 33 lines · Cédric Le Goater

Hello Sean,

+ Daniel

Quoted 11 lines · Sean Wei

Hi Cédric,

Thank you for the quick review and for suggesting the SPDX approach.

Quoted 5 lines · Cédric Le Goater

Instead, I would remove the license boiler plate and add :

SPDX-License-Identifier: GPL-2.0-or-later

Quoted 8 lines

Before we respin the patch, could you please confirm the scope below?

1. For the two headers currently under review
(aspeed_i2c.h and aspeed_timer.h)

I will drop the multi-line GPL boiler-plate and replace it with SPDX line, while keeping the copyright statements.

Fine with me.

Quoted 6 lines

2. For the other ASPEED-maintained files

        hw/*/*aspeed*
        include/hw/*/*aspeed*
        tests/*/*aspeed*
Quoted 8 lines
Quoted 2 lines

Would you prefer to convert them as well? If so, I'd prefer to send a dedicated patch series after this one.

OK. As you wish.

I think you can convert all QEMU files while at it. See:

https://lore.kernel.org/qemu-devel/[email protected]/

Note that rules triggers *exclusively* for new files, not for any existing files.

With regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
#16 lore raw

Re: [PATCH 05/12] include/hw: replace FSF postal address with licenses URL

In reply to Cédric Le Goater
Quoted 6 lines · Cédric Le Goater

Hello Sean,

Quoted 3 lines · Sean Wei

Some of the GPLv2 boiler-plate still contained the obsolete "51 Franklin Street" postal address.

Quoted 8 lines
Quoted 4 lines

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

Instead, I would remove the license boiler plate and add :

SPDX-License-Identifier: GPL-2.0-or-later

This is *NOT* something we are doing for existing code sources, unless the person removing it is the exclusive copyright holder on the file.

With regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
#17 lore raw

Re: [PATCH 05/12] include/hw: replace FSF postal address with licenses URL

Quoted 12 lines · Daniel P. Berrangé
Quoted 11 lines · Cédric Le Goater

Hello Sean,

Quoted 7 lines · Sean Wei

Some of the GPLv2 boiler-plate still contained the obsolete "51 Franklin Street" postal address.

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

Quoted 7 lines
Quoted 3 lines

Instead, I would remove the license boiler plate and add :

SPDX-License-Identifier: GPL-2.0-or-later

This is *NOT* something we are doing for existing code sources, unless the person removing it is the exclusive copyright holder on the file.

Ah. So I misunderstood.

How is license boiler plate different from the SPDX identifier tag ?

Thanks,

C.

#18 lore raw

Re: [PATCH 05/12] include/hw: replace FSF postal address with licenses URL

Quoted 15 lines · Cédric Le Goater
Quoted 14 lines · Daniel P. Berrangé
Quoted 13 lines · Cédric Le Goater

Hello Sean,

Quoted 7 lines · Sean Wei

Some of the GPLv2 boiler-plate still contained the obsolete "51 Franklin Street" postal address.

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

Instead, I would remove the license boiler plate and add :

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

SPDX-License-Identifier: GPL-2.0-or-later

This is *NOT* something we are doing for existing code sources, unless the person removing it is the exclusive copyright holder on the file.

Ah. So I misunderstood.

How is license boiler plate different from the SPDX identifier tag ?

It achieves the same aims, but notice GPL clause 1

"keep intact all the notices that refer to this License and
to the absence of any warranty;"

and yes, some projects have none the less done a wholesale replacement of boilerplate. I don't know how they rationalized ignoring this license requirement. It is simpler to just preserve boilerplate as-is that to debate the legal nuances of this.

With regards,
Daniel

Signature · 3 lines
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
#19 lore raw

Re: [PATCH 05/12] include/hw: replace FSF postal address with licenses URL

Quoted 27 lines · Daniel P. Berrangé
Quoted 15 lines · Cédric Le Goater
Quoted 14 lines · Daniel P. Berrangé
Quoted 13 lines · Cédric Le Goater

Hello Sean,

Quoted 7 lines · Sean Wei

Some of the GPLv2 boiler-plate still contained the obsolete "51 Franklin Street" postal address.

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

Instead, I would remove the license boiler plate and add :

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

SPDX-License-Identifier: GPL-2.0-or-later

This is *NOT* something we are doing for existing code sources, unless the person removing it is the exclusive copyright holder on the file.

Ah. So I misunderstood.

How is license boiler plate different from the SPDX identifier tag ?

It achieves the same aims, but notice GPL clause 1

Quoted 7 lines

"keep intact all the notices that refer to this License and
to the absence of any warranty;"

and yes, some projects have none the less done a wholesale replacement of boilerplate. I don't know how they rationalized ignoring this license requirement. It is simpler to just preserve boilerplate as-is that to debate the legal nuances of this.

OK. Then, let's forget about this replacement.

Thanks,

C.

author
#20 lore raw

Re: [PATCH 05/12] include/hw: replace FSF postal address with licenses URL

In reply to Cédric Le Goater

Hi Cédric & Daniel,

Quoted 35 lines · Cédric Le Goater
Quoted 27 lines · Daniel P. Berrangé
Quoted 15 lines · Cédric Le Goater
Quoted 14 lines · Daniel P. Berrangé
Quoted 13 lines · Cédric Le Goater

Hello Sean,

Quoted 7 lines · Sean Wei

Some of the GPLv2 boiler-plate still contained the obsolete "51 Franklin Street" postal address.

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

Instead,  I would remove the license boiler plate and add :

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

    SPDX-License-Identifier: GPL-2.0-or-later

This is *NOT* something we are doing for existing code sources, unless the person removing it is the exclusive copyright holder on the file.

Ah. So I misunderstood.

How is license boiler plate different from the SPDX identifier tag ?

It achieves the same aims, but notice GPL clause 1

Quoted 7 lines

   "keep intact all the notices that refer to this License and to the absence of any warranty;"

and yes, some projects have none the less done a wholesale replacement of boilerplate. I don't know how they rationalized ignoring this license requirement. It is simpler to just preserve boilerplate as-is that to debate the legal nuances of this.

Quoted 6 lines

OK. Then, let's forget about this replacement.

Thanks,

C.

Thank you both for the clarification! To avoid any controversy, I will keep the patch in its original form, only replacing the deprecated FSF address with the canonical GNU licenses URL.

Cédric, could you please take another look and let me know if everything looks good? If so, I'd be grateful if you could add a Reviewed-by tag. Thanks!

All the best,
Sean Wei

#21 lore raw

Re: [PATCH 05/12] include/hw: replace FSF postal address with licenses URL

Quoted 38 lines · Sean Wei

Hi Cédric & Daniel,

Quoted 35 lines · Cédric Le Goater
Quoted 34 lines · Daniel P. Berrangé
Quoted 15 lines · Cédric Le Goater
Quoted 14 lines · Daniel P. Berrangé
Quoted 13 lines · Cédric Le Goater

Hello Sean,

Quoted 7 lines · Sean Wei

Some of the GPLv2 boiler-plate still contained the obsolete "51 Franklin Street" postal address.

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

Instead,  I would remove the license boiler plate and add :

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

    SPDX-License-Identifier: GPL-2.0-or-later

This is *NOT* something we are doing for existing code sources, unless the person removing it is the exclusive copyright holder on the file.

Ah. So I misunderstood.

How is license boiler plate different from the SPDX identifier tag ?

It achieves the same aims, but notice GPL clause 1

   "keep intact all the notices that refer to this License and to the absence of any warranty;"

and yes, some projects have none the less done a wholesale replacement of boilerplate. I don't know how they rationalized ignoring this license requirement. It is simpler to just preserve boilerplate as-is that to debate the legal nuances of this.

Quoted 8 lines
Quoted 6 lines

OK. Then, let's forget about this replacement.

Thanks,

C.

Thank you both for the clarification! To avoid any controversy, I will keep the patch in its original form, only replacing the deprecated FSF address with the canonical GNU licenses URL.

yep.

Quoted 1 line

Cédric, could you please take another look and let me know if everything looks good? If so, I'd be grateful if you could add a Reviewed-by tag. Thanks!

sure.

Thanks,

C.

Reviewed-by on v1 5/12
#22 lore raw

Re: [PATCH 05/12] include/hw: replace FSF postal address with licenses URL

In reply to Sean Wei
Quoted 47 lines · Sean Wei

Some of the GPLv2 boiler-plate still contained the obsolete "51 Franklin Street" postal address.

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

---
  include/hw/i2c/aspeed_i2c.h     | 3 +--
  include/hw/pci/pci_bridge.h     | 4 ++--
  include/hw/timer/aspeed_timer.h | 3 +--
  3 files changed, 4 insertions(+), 6 deletions(-)
include/hw/i2c/aspeed_i2c.h +1 -2
index 2c4c81bd20..2daacc10ce 100644
@@ -14,8 +14,7 @@
   *  GNU General Public License for more details.
   *
   *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  with this program; if not, see <https://www.gnu.org/licenses/>.
   */
 
  #ifndef ASPEED_I2C_H
include/hw/pci/pci_bridge.h +2 -2
index b0f5204d80..8cdacbc4e1 100644
@@ -14,8 +14,8 @@
   * GNU General Public License for more details.
   *
   * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * along with this program; if not, see
+ * <https://www.gnu.org/licenses/>.
   *
   * split out pci bus specific stuff from pci.[hc] to pci_bridge.[hc]
   * Copyright (c) 2009 Isaku Yamahata <yamahata at valinux co jp>
include/hw/timer/aspeed_timer.h +0 -0
index 767cae4b05..a850625a05 100644

include/hw/timer/aspeed_timer.h line 22

Quoted 9 lines
include/hw/timer/aspeed_timer.h +1 -2
@@ -16,8 +16,7 @@
   *  GNU General Public License for more details.
   *
   *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *  with this program; if not, see <https://www.gnu.org/licenses/>.
   */
  #ifndef ASPEED_TIMER_H
  #define ASPEED_TIMER_H

Thanks,

C.

Reviewed-by on v1 12/12
#36 lore raw

Re: [PATCH 12/12] target/i386/emulate: replace FSF postal address with licenses URL

In reply to Sean Wei
Quoted 7 lines · Sean Wei

Some of the LGPLv2.1 boiler-plate still contained the obsolete "51 Franklin Street" postal address.

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

It looks to me this is just following the footsteps of commit 8167ee883.

Quoted 54 lines
---
 target/i386/emulate/x86_emu.c   | 4 ++--
 target/i386/emulate/x86_flags.c | 4 ++--
 target/i386/emulate/x86_flags.h | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
target/i386/emulate/x86_emu.c +2 -2
index 4890e0a4e5..db7a7f7437 100644
@@ -31,8 +31,8 @@
 //  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, write to the Free Software
-//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA B 02110-1301 USA
+//  License along with this library; if not, see
+//  <https://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////
 
 #include "qemu/osdep.h"
target/i386/emulate/x86_flags.c +2 -2
index cc138c7749..6592193b5e 100644
@@ -14,8 +14,8 @@
 //  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, write to the Free Software
-//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA B 02110-1301 USA
+//  License along with this library; if not, see
+//  <https://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////
 /*
  * flags functions
target/i386/emulate/x86_flags.h +2 -2
index 28b008e577..a395c837a0 100644
@@ -14,8 +14,8 @@
 //  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, write to the Free Software
-//  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA B 02110-1301 USA
+//  License along with this library; if not, see
+//  <https://www.gnu.org/licenses/>.
 /////////////////////////////////////////////////////////////////////////
 /*
  * x86 eflags functions
Signature · 1 line
2.49.0
#2 lore raw

Re: [PATCH 01/12] COPYING: replace FSF postal address with licenses URL

In reply to Sean Wei

linux-headers/LICENSES/preferred/GPL-2.0

Quoted 64 lines · Sean Wei

The license text in COPYING (GPLv2), COPYING.LIB (LGPLv2.1), and the linux-headers/LICENSES/preferred/GPL-2.0 file are referenced to the obsolete FSF postal address.

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

---
  COPYING                                  | 5 ++---
  COPYING.LIB                              | 5 ++---
  linux-headers/LICENSES/preferred/GPL-2.0 | 5 ++---
  3 files changed, 6 insertions(+), 9 deletions(-)
COPYING +2 -3
index 00ccfbb628..8095135d50 100644
@@ -2,7 +2,7 @@
  		       Version 2, June 1991
 
   Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ <https://fsf.org/>
   Everyone is permitted to copy and distribute verbatim copies
   of this license document, but changing it is not allowed.
 
@@ -304,8 +304,7 @@ the "copyright" line and a pointer to where the full notice is found.
      GNU General Public License for more details.
 
      You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    with this program; if not, see <https://www.gnu.org/licenses/>.
 
  Also add information on how to contact you by electronic and paper mail.
 
COPYING.LIB +2 -3
index 4362b49151..99f47575b5 100644
@@ -2,7 +2,7 @@
                         Version 2.1, February 1999
 
   Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ <https://fsf.org/>
   Everyone is permitted to copy and distribute verbatim copies
   of this license document, but changing it is not allowed.
 
@@ -484,8 +484,7 @@ convey the exclusion of warranty; and each file should have at least the
      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, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+    License along with this library; if not, see <https://www.gnu.org/licenses/>.
 
  Also add information on how to contact you by electronic and paper mail.
 
linux-headers/LICENSES/preferred/GPL-2.0 +0 -0
index ff0812fd89..10248a619e 100644

The files in linux-headers are sync'ed by the script scripts/update-linux-headers.sh ... so these changes will be reverted the next time someone runs the script. I'd suggest to drop this part of the patch - if you feel like contributing a patch to the Linux kernel, you could fix it there instead.

Thomas

#4 lore raw

Re: [PATCH 02/12] linux-headers: replace FSF postal address with licenses URL

In reply to Sean Wei
Quoted 32 lines · Sean Wei

The GPLv2 boiler-plate in asm-arm/kvm.h and asm-powerpc/kvm.h still contained the obsolete "51 Franklin Street" postal address.

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

---
  linux-headers/asm-arm/kvm.h     | 4 ++--
  linux-headers/asm-powerpc/kvm.h | 4 ++--
  2 files changed, 4 insertions(+), 4 deletions(-)
linux-headers/asm-arm/kvm.h +2 -2
index 0db5644e27..a8bb1aa42a 100644
@@ -13,8 +13,8 @@
   * GNU General Public License for more details.
   *
   * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * along with this program; if not, see
+ * <https://www.gnu.org/licenses/>.
   */
 
  #ifndef __ARM_KVM_H__
linux-headers/asm-powerpc/kvm.h +0 -0
index eaeda00178..83faa7fae3 100644

linux-headers/asm-powerpc/kvm.h line 17

Quoted 10 lines
linux-headers/asm-powerpc/kvm.h +2 -2
@@ -10,8 +10,8 @@
   * GNU General Public License for more details.
   *
   * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ * along with this program; if not, see
+ * <https://www.gnu.org/licenses/>.
   *
   * Copyright IBM Corp. 2007
   *

This also has to be fixed in the Linux kernel first, otherwise the changes will be reverted when someone runs the scripts/update-linux-headers.sh script. Sorry, I should have mentioned that in the https://gitlab.com/qemu-project/qemu/-/issues/2974 ticket, but I missed it, sorry!

Thomas

Reviewed-by on v1 3/12
#6 lore raw

Re: [PATCH 03/12] libdecnumber: replace FSF postal address with licenses URL

In reply to Sean Wei
Quoted 6 lines · Sean Wei

Some of the GPLv2 boiler-plate still contained the obsolete "51 Franklin Street" postal address.

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

Quoted 8 lines
---
  libdecnumber/decContext.c     | 5 ++---
  libdecnumber/decNumber.c      | 5 ++---
  libdecnumber/dpd/decimal128.c | 5 ++---
  libdecnumber/dpd/decimal32.c  | 5 ++---
  libdecnumber/dpd/decimal64.c  | 5 ++---
  5 files changed, 10 insertions(+), 15 deletions(-)
Reviewed-by on v1 4/12
#8 lore raw

Re: [PATCH 04/12] include/libdecnumber: replace FSF postal address with licenses URL

In reply to Sean Wei
Quoted 7 lines · Sean Wei

Some of the GPLv2 boiler-plate still contained the obsolete "51 Franklin Street" postal address.

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

Quoted 11 lines
---
  include/libdecnumber/dconfig.h             | 5 ++---
  include/libdecnumber/decContext.h          | 5 ++---
  include/libdecnumber/decDPD.h              | 5 ++---
  include/libdecnumber/decNumber.h           | 5 ++---
  include/libdecnumber/decNumberLocal.h      | 5 ++---
  include/libdecnumber/dpd/decimal128.h      | 5 ++---
  include/libdecnumber/dpd/decimal128Local.h | 5 ++---
  include/libdecnumber/dpd/decimal32.h       | 5 ++---
  include/libdecnumber/dpd/decimal64.h       | 5 ++---
  9 files changed, 18 insertions(+), 27 deletions(-)
Reviewed-by on v1 6/12
#24 lore raw

Re: [PATCH 06/12] include/qemu: replace FSF postal address with licenses URL

In reply to Sean Wei
Quoted 11 lines · Sean Wei

The LGPLv2.1 boiler-plate in rcu.h and rcu_queue.h still contained the obsolete "51 Franklin Street" postal address.

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

---
  include/qemu/rcu.h       | 4 ++--
  include/qemu/rcu_queue.h | 4 ++--
  2 files changed, 4 insertions(+), 4 deletions(-)
Reviewed-by on v1 7/12
#26 lore raw

Re: [PATCH 07/12] util/rcu.c: replace FSF postal address with licenses URL

In reply to Sean Wei
Quoted 16 lines · Sean Wei

The LGPLv2.1 boiler-plate in util/rcu.c still contained the obsolete "51 Franklin Street" postal address.

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

---
  util/rcu.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
util/rcu.c +0 -0
index fa32c942e4..b703c86f15 100644

util/rcu.c line 27

Quoted 10 lines
util/rcu.c +2 -2
@@ -20,8 +20,8 @@
   * 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * License along with this library; if not, see
+ * <https://www.gnu.org/licenses/>.
   *
   * IBM's contributions to this file may be relicensed under LGPLv2 or later.
   */
Reviewed-by on v1 8/12
#28 lore raw

Re: [PATCH 08/12] hw: replace FSF postal address with licenses URL

In reply to Sean Wei
Quoted 11 lines · Sean Wei

The GPLv2 boiler-plate in vmxnet3.h and vmw_pvscsi.h still contained the obsolete "51 Franklin Street" postal address.

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

---
  hw/net/vmxnet3.h     | 4 ++--
  hw/scsi/vmw_pvscsi.h | 4 ++--
  2 files changed, 4 insertions(+), 4 deletions(-)
Reviewed-by on v1 9/12
#30 lore raw

Re: [PATCH 09/12] scripts: replace FSF postal address with licenses URL

In reply to Sean Wei
Quoted 16 lines · Sean Wei

The GPLv2 boiler-plate in scripts/device-crash-test still contained the obsolete "51 Franklin Street" postal address.

Replace it with the canonical GNU licenses URL recommended by the FSF:
https://www.gnu.org/licenses/

---
  scripts/device-crash-test | 3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
scripts/device-crash-test +0 -0
index da8b56edd9..1ecb9663ae 100755

scripts/device-crash-test line 22

Quoted 9 lines
scripts/device-crash-test +1 -2
@@ -16,8 +16,7 @@
  # GNU General Public License for more details.
  #
  # You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# with this program; if not, see <https://www.gnu.org/licenses/>.
 
  """
  Run QEMU with all combinations of -machine and -device types,
#37 lore raw
In reply to Sean Wei
Quoted 15 lines · Sean Wei

The boiler-plate licence headers in several parts of QEMU still contain the obsolete “51 Franklin Street" contact line.

The Free Software Foundation now recommends using the canonical URL:

https://www.gnu.org/licenses/

This patch updates those headers. The patches are comment-only; no source code changes.

Please review and let me know if any patch should be split, squashed or dropped. This is my first patch for the QEMU project, so any feedback is greatly appreciated.

Quoted 6 lines

Thanks to Thomas Huth <[email protected]> for proposing this issue and outlining the steps, and to Daniel P. Berrangé <[email protected]> for the clarifications.

Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2438

It's rather https://gitlab.com/qemu-project/qemu/-/issues/2974 instead, but anyway, thanks for tackling this!

I'll queue the patches (except the one that updates linux-headers) for my next pull request.

Thomas