| Message ID | 20210222185605.2714192-1-f4bug@amsat.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | hw/sh4/sh7750_regs: Replace link to license by its full content | expand |
ping? On 2/22/21 7:56 PM, Philippe Mathieu-Daudé wrote: > This file is borrowed from the RTEMS source code, which comes > with a GPL-2.0-or-later license with a header exception. > > Expand the GPL-2.0-or-later license in place to not be dependent > on a 3rd party website. This also fix the misleading comment "The > license and distribution terms for this file may be found in the > file LICENSE in this distribution" referring to the RTEMS distribution > and not to the QEMU one. > > Suggested-by: Peter Maydell <peter.maydell@linaro.org> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/sh4/sh7750_regs.h | 24 ++++++++++++++++++++++-- > 1 file changed, 22 insertions(+), 2 deletions(-) > > diff --git a/hw/sh4/sh7750_regs.h b/hw/sh4/sh7750_regs.h > index 3e4554af315..ab073dadc74 100644 > --- a/hw/sh4/sh7750_regs.h > +++ b/hw/sh4/sh7750_regs.h > @@ -10,8 +10,28 @@ > * Victor V. Vengerov <vvv@oktet.ru> > * > * The license and distribution terms for this file may be > - * found in the file LICENSE in this distribution or at > - * http://www.rtems.com/license/LICENSE. > + * found in this file hereafter or at http://www.rtems.com/license/LICENSE. > + * > + * LICENSE INFORMATION > + * > + * RTEMS is free software; you can redistribute it and/or modify it under > + * terms of the GNU General Public License as published by the > + * Free Software Foundation; either version 2, or (at your option) any > + * later version. RTEMS 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 > + * General Public License for more details. You should have received > + * a copy of the GNU General Public License along with RTEMS; see > + * file COPYING. If not, write to the Free Software Foundation, 675 > + * Mass Ave, Cambridge, MA 02139, USA. > + * > + * As a special exception, including RTEMS header files in a file, > + * instantiating RTEMS generics or templates, or linking other files > + * with RTEMS objects to produce an executable application, does not > + * by itself cause the resulting executable application to be covered > + * by the GNU General Public License. This exception does not > + * however invalidate any other reasons why the executable file might be > + * covered by the GNU Public License. > * > * @(#) sh7750_regs.h,v 1.2.4.1 2003/09/04 18:46:00 joel Exp > */ >
On Thu, 4 Mar 2021 at 13:47, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > > ping? > > On 2/22/21 7:56 PM, Philippe Mathieu-Daudé wrote: > > This file is borrowed from the RTEMS source code, which comes > > with a GPL-2.0-or-later license with a header exception. > > > > Expand the GPL-2.0-or-later license in place to not be dependent > > on a 3rd party website. This also fix the misleading comment "The > > license and distribution terms for this file may be found in the > > file LICENSE in this distribution" referring to the RTEMS distribution > > and not to the QEMU one. > > > > Suggested-by: Peter Maydell <peter.maydell@linaro.org> > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > > --- Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM
On 2/22/21 7:56 PM, Philippe Mathieu-Daudé wrote: > This file is borrowed from the RTEMS source code, which comes > with a GPL-2.0-or-later license with a header exception. > > Expand the GPL-2.0-or-later license in place to not be dependent > on a 3rd party website. This also fix the misleading comment "The > license and distribution terms for this file may be found in the > file LICENSE in this distribution" referring to the RTEMS distribution > and not to the QEMU one. > > Suggested-by: Peter Maydell <peter.maydell@linaro.org> > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/sh4/sh7750_regs.h | 24 ++++++++++++++++++++++-- > 1 file changed, 22 insertions(+), 2 deletions(-) Thanks, applied to renesas-next.
diff --git a/hw/sh4/sh7750_regs.h b/hw/sh4/sh7750_regs.h index 3e4554af315..ab073dadc74 100644 --- a/hw/sh4/sh7750_regs.h +++ b/hw/sh4/sh7750_regs.h @@ -10,8 +10,28 @@ * Victor V. Vengerov <vvv@oktet.ru> * * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. + * found in this file hereafter or at http://www.rtems.com/license/LICENSE. + * + * LICENSE INFORMATION + * + * RTEMS is free software; you can redistribute it and/or modify it under + * terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2, or (at your option) any + * later version. RTEMS 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 + * General Public License for more details. You should have received + * a copy of the GNU General Public License along with RTEMS; see + * file COPYING. If not, write to the Free Software Foundation, 675 + * Mass Ave, Cambridge, MA 02139, USA. + * + * As a special exception, including RTEMS header files in a file, + * instantiating RTEMS generics or templates, or linking other files + * with RTEMS objects to produce an executable application, does not + * by itself cause the resulting executable application to be covered + * by the GNU General Public License. This exception does not + * however invalidate any other reasons why the executable file might be + * covered by the GNU Public License. * * @(#) sh7750_regs.h,v 1.2.4.1 2003/09/04 18:46:00 joel Exp */
This file is borrowed from the RTEMS source code, which comes with a GPL-2.0-or-later license with a header exception. Expand the GPL-2.0-or-later license in place to not be dependent on a 3rd party website. This also fix the misleading comment "The license and distribution terms for this file may be found in the file LICENSE in this distribution" referring to the RTEMS distribution and not to the QEMU one. Suggested-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/sh4/sh7750_regs.h | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-)