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/
Signed-off-by: Sean Wei <me@sean.taipei>
---
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(-)
diff --git a/include/hw/i2c/aspeed_i2c.h b/include/hw/i2c/aspeed_i2c.h
index 2c4c81bd20..2daacc10ce 100644
--- a/include/hw/i2c/aspeed_i2c.h
+++ b/include/hw/i2c/aspeed_i2c.h
@@ -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
diff --git a/include/hw/pci/pci_bridge.h b/include/hw/pci/pci_bridge.h
index b0f5204d80..8cdacbc4e1 100644
--- a/include/hw/pci/pci_bridge.h
+++ b/include/hw/pci/pci_bridge.h
@@ -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>
diff --git a/include/hw/timer/aspeed_timer.h b/include/hw/timer/aspeed_timer.h
index 767cae4b05..a850625a05 100644
--- a/include/hw/timer/aspeed_timer.h
+++ b/include/hw/timer/aspeed_timer.h
@@ -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
--
2.49.0On 6/13/25 18:44, Sean Wei wrote: > 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/ > > Signed-off-by: Sean Wei <me@sean.taipei> > --- > 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(-) > > diff --git a/include/hw/i2c/aspeed_i2c.h b/include/hw/i2c/aspeed_i2c.h > index 2c4c81bd20..2daacc10ce 100644 > --- a/include/hw/i2c/aspeed_i2c.h > +++ b/include/hw/i2c/aspeed_i2c.h > @@ -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 > diff --git a/include/hw/pci/pci_bridge.h b/include/hw/pci/pci_bridge.h > index b0f5204d80..8cdacbc4e1 100644 > --- a/include/hw/pci/pci_bridge.h > +++ b/include/hw/pci/pci_bridge.h > @@ -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> > diff --git a/include/hw/timer/aspeed_timer.h b/include/hw/timer/aspeed_timer.h > index 767cae4b05..a850625a05 100644 > --- a/include/hw/timer/aspeed_timer.h > +++ b/include/hw/timer/aspeed_timer.h > @@ -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 Reviewed-by: Cédric Le Goater <clg@redhat.com> Thanks, C.
Hello Sean, On 6/13/25 18:44, Sean Wei wrote: > 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/ > > Signed-off-by: Sean Wei <me@sean.taipei> Instead, I would remove the license boiler plate and add : SPDX-License-Identifier: GPL-2.0-or-later Thanks, C. > --- > 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(-) > > diff --git a/include/hw/i2c/aspeed_i2c.h b/include/hw/i2c/aspeed_i2c.h > index 2c4c81bd20..2daacc10ce 100644 > --- a/include/hw/i2c/aspeed_i2c.h > +++ b/include/hw/i2c/aspeed_i2c.h > @@ -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 > diff --git a/include/hw/pci/pci_bridge.h b/include/hw/pci/pci_bridge.h > index b0f5204d80..8cdacbc4e1 100644 > --- a/include/hw/pci/pci_bridge.h > +++ b/include/hw/pci/pci_bridge.h > @@ -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> > diff --git a/include/hw/timer/aspeed_timer.h b/include/hw/timer/aspeed_timer.h > index 767cae4b05..a850625a05 100644 > --- a/include/hw/timer/aspeed_timer.h > +++ b/include/hw/timer/aspeed_timer.h > @@ -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
On Sat, Jun 14, 2025 at 07:29:09AM +0200, Cédric Le Goater wrote: > Hello Sean, > > On 6/13/25 18:44, Sean Wei wrote: > > 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/ > > > > Signed-off-by: Sean Wei <me@sean.taipei> > > 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 -- |: 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 :|
On 6/16/25 09:13, Daniel P. Berrangé wrote: > On Sat, Jun 14, 2025 at 07:29:09AM +0200, Cédric Le Goater wrote: >> Hello Sean, >> >> On 6/13/25 18:44, Sean Wei wrote: >>> 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/ >>> >>> Signed-off-by: Sean Wei <me@sean.taipei> >> >> 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.
On Mon, Jun 16, 2025 at 09:29:35AM +0200, Cédric Le Goater wrote: > On 6/16/25 09:13, Daniel P. Berrangé wrote: > > On Sat, Jun 14, 2025 at 07:29:09AM +0200, Cédric Le Goater wrote: > > > Hello Sean, > > > > > > On 6/13/25 18:44, Sean Wei wrote: > > > > 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/ > > > > > > > > Signed-off-by: Sean Wei <me@sean.taipei> > > > > > > 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 ? 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 -- |: 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 :|
On 6/16/25 09:47, Daniel P. Berrangé wrote: > On Mon, Jun 16, 2025 at 09:29:35AM +0200, Cédric Le Goater wrote: >> On 6/16/25 09:13, Daniel P. Berrangé wrote: >>> On Sat, Jun 14, 2025 at 07:29:09AM +0200, Cédric Le Goater wrote: >>>> Hello Sean, >>>> >>>> On 6/13/25 18:44, Sean Wei wrote: >>>>> 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/ >>>>> >>>>> Signed-off-by: Sean Wei <me@sean.taipei> >>>> >>>> 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 ? > > 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. OK. Then, let's forget about this replacement. Thanks, C.
Hi Cédric & Daniel, On 2025/6/16 3:55 AM, Cédric Le Goater wrote: > On 6/16/25 09:47, Daniel P. Berrangé wrote: >> On Mon, Jun 16, 2025 at 09:29:35AM +0200, Cédric Le Goater wrote: >>> On 6/16/25 09:13, Daniel P. Berrangé wrote: >>>> On Sat, Jun 14, 2025 at 07:29:09AM +0200, Cédric Le Goater wrote: >>>>> Hello Sean, >>>>> >>>>> On 6/13/25 18:44, Sean Wei wrote: >>>>>> 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/ >>>>>> >>>>>> Signed-off-by: Sean Wei <me@sean.taipei> >>>>> >>>>> 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 ? >> >> 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. > 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
On 6/16/25 14:49, Sean Wei wrote: > Hi Cédric & Daniel, > > On 2025/6/16 3:55 AM, Cédric Le Goater wrote: >> On 6/16/25 09:47, Daniel P. Berrangé wrote: >>> On Mon, Jun 16, 2025 at 09:29:35AM +0200, Cédric Le Goater wrote: >>>> On 6/16/25 09:13, Daniel P. Berrangé wrote: >>>>> On Sat, Jun 14, 2025 at 07:29:09AM +0200, Cédric Le Goater wrote: >>>>>> Hello Sean, >>>>>> >>>>>> On 6/13/25 18:44, Sean Wei wrote: >>>>>>> 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/ >>>>>>> >>>>>>> Signed-off-by: Sean Wei <me@sean.taipei> >>>>>> >>>>>> 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 ? >>> >>> 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. >> 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. > 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.
Hi Cédric,
Thank you for the quick review and for suggesting the SPDX approach.
On Sat, Jun 14, 2025 at 1:36 AM Cédric Le Goater <clg@kaod.org> wrote:
>
> 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
Hello Sean, + Daniel On 6/14/25 14:58, Sean Wei wrote: > Hi Cédric, > > Thank you for the quick review and for suggesting the SPDX approach. > > On Sat, Jun 14, 2025 at 1:36 AM Cédric Le Goater <clg@kaod.org> wrote: >> >> 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. Fine with me. > 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/20250519171004.352636-10-berrange@redhat.com/ > 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. > 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. > 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
On Sat, Jun 14, 2025 at 05:33:42PM +0200, Cédric Le Goater wrote: > Hello Sean, > > + Daniel > > On 6/14/25 14:58, Sean Wei wrote: > > Hi Cédric, > > > > Thank you for the quick review and for suggesting the SPDX approach. > > > > On Sat, Jun 14, 2025 at 1:36 AM Cédric Le Goater <clg@kaod.org> wrote: > > > > > > 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. > > Fine with me. > > > 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/20250519171004.352636-10-berrange@redhat.com/ Note that rules triggers *exclusively* for new files, not for any existing files. With regards, Daniel -- |: 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 :|
Hi Cédric,
Thanks for pointing me to the earlier thread, moving to
the `SPDX-License-Identifier` tags is the better long-term fix.
> 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.
> 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
Hello Sean On 6/14/25 22:22, Sean Wei wrote: > Hi Cédric, > > Thanks for pointing me to the earlier thread, moving to > the `SPDX-License-Identifier` tags is the better long-term fix. > > > > 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. > > > > 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 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. > > ## 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? LGTM. I will merge these changes through the aspeed tree. Thanks, C.
© 2016 - 2025 Red Hat, Inc.