| Message ID | 1331689198-11076-3-git-send-email-afaerber@suse.de |
|---|---|
| State | New |
| Headers | show |
On Wed, 2012-03-14 at 02:39 +0100, Andreas Färber wrote: > Adopt the license text suggested by Guan Xue-tao for all files except > helper.c, to which Anthony Liguori (IBM) contributed a g_malloc() call. > > Signed-off-by: Andreas Färber <afaerber@suse.de> > Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> > Signed-off-by: Stefan Weil <sw@weilnetz.de> > Signed-off-by: Blue Swirl <blauwirbel@gmail.com> > Signed-off-by: Dor Laor <dlaor@redhat.com> > --- > target-unicore32/cpu.h | 5 ++--- > target-unicore32/helper.h | 5 ++--- > target-unicore32/op_helper.c | 5 ++--- > target-unicore32/translate.c | 5 ++--- target-unicore32/helper.c is skipped. Guan Xuetao > 4 files changed, 8 insertions(+), 12 deletions(-) > > diff --git a/target-unicore32/cpu.h b/target-unicore32/cpu.h > index a3f8589..9cbee7a 100644 > --- a/target-unicore32/cpu.h > +++ b/target-unicore32/cpu.h > @@ -3,9 +3,8 @@ > * > * Copyright (C) 2010-2011 GUAN Xue-tao > * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 as > - * published by the Free Software Foundation. > + * This program is licensed under the terms of the GNU GPL, version 2 or > + * later. See the COPYING file in the top-level directory. > */ > #ifndef __CPU_UC32_H__ > #define __CPU_UC32_H__ > diff --git a/target-unicore32/helper.h b/target-unicore32/helper.h > index 615de2a..5aa7de8 100644 > --- a/target-unicore32/helper.h > +++ b/target-unicore32/helper.h > @@ -1,9 +1,8 @@ > /* > * Copyright (C) 2010-2011 GUAN Xue-tao > * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 as > - * published by the Free Software Foundation. > + * This program is licensed under the terms of the GNU GPL, version 2 or > + * later. See the COPYING file in the top-level directory. > */ > #include "def-helper.h" > > diff --git a/target-unicore32/op_helper.c b/target-unicore32/op_helper.c > index 638a020..9fc2b1f 100644 > --- a/target-unicore32/op_helper.c > +++ b/target-unicore32/op_helper.c > @@ -3,9 +3,8 @@ > * > * Copyright (C) 2010-2011 GUAN Xue-tao > * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 as > - * published by the Free Software Foundation. > + * This program is licensed under the terms of the GNU GPL, version 2 or > + * later. See the COPYING file in the top-level directory. > */ > #include "cpu.h" > #include "dyngen-exec.h" > diff --git a/target-unicore32/translate.c b/target-unicore32/translate.c > index 3b3ba16..c01e636 100644 > --- a/target-unicore32/translate.c > +++ b/target-unicore32/translate.c > @@ -3,9 +3,8 @@ > * > * Copyright (C) 2010-2011 GUAN Xue-tao > * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 as > - * published by the Free Software Foundation. > + * This program is licensed under the terms of the GNU GPL, version 2 or > + * later. See the COPYING file in the top-level directory. > */ > #include <stdarg.h> > #include <stdlib.h>
Am 14.03.2012 08:53, schrieb Guan Xuetao: > On Wed, 2012-03-14 at 02:39 +0100, Andreas Färber wrote: >> Adopt the license text suggested by Guan Xue-tao for all files except >> helper.c, to which Anthony Liguori (IBM) contributed a g_malloc() call. >> >> Signed-off-by: Andreas Färber <afaerber@suse.de> >> Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> >> Signed-off-by: Stefan Weil <sw@weilnetz.de> >> Signed-off-by: Blue Swirl <blauwirbel@gmail.com> >> Signed-off-by: Dor Laor <dlaor@redhat.com> >> --- >> target-unicore32/cpu.h | 5 ++--- >> target-unicore32/helper.h | 5 ++--- >> target-unicore32/op_helper.c | 5 ++--- >> target-unicore32/translate.c | 5 ++--- > target-unicore32/helper.c is skipped. ...which is explained in the above commit message and in the cover letter. :) Whether we can relicense it to GPLv2+ after patch 3/7 (which redoes object instantiation in a way not derived from an IBM contribution) remained an open question. IANAL. What we can do, similar to Paolo's solution for central files, is to add a notice to helper.c that makes new contributions from, e.g., today on GPLv2+ so we don't need to ask for more people's permission. Andreas
On Wed, Mar 14, 2012 at 01:39, Andreas Färber <afaerber@suse.de> wrote: > Adopt the license text suggested by Guan Xue-tao for all files except > helper.c, to which Anthony Liguori (IBM) contributed a g_malloc() call. > > Signed-off-by: Andreas Färber <afaerber@suse.de> > Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> > Signed-off-by: Stefan Weil <sw@weilnetz.de> > Signed-off-by: Blue Swirl <blauwirbel@gmail.com> Ack. > Signed-off-by: Dor Laor <dlaor@redhat.com> > --- > target-unicore32/cpu.h | 5 ++--- > target-unicore32/helper.h | 5 ++--- > target-unicore32/op_helper.c | 5 ++--- > target-unicore32/translate.c | 5 ++--- > 4 files changed, 8 insertions(+), 12 deletions(-) > > diff --git a/target-unicore32/cpu.h b/target-unicore32/cpu.h > index a3f8589..9cbee7a 100644 > --- a/target-unicore32/cpu.h > +++ b/target-unicore32/cpu.h > @@ -3,9 +3,8 @@ > * > * Copyright (C) 2010-2011 GUAN Xue-tao > * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 as > - * published by the Free Software Foundation. > + * This program is licensed under the terms of the GNU GPL, version 2 or > + * later. See the COPYING file in the top-level directory. > */ > #ifndef __CPU_UC32_H__ > #define __CPU_UC32_H__ > diff --git a/target-unicore32/helper.h b/target-unicore32/helper.h > index 615de2a..5aa7de8 100644 > --- a/target-unicore32/helper.h > +++ b/target-unicore32/helper.h > @@ -1,9 +1,8 @@ > /* > * Copyright (C) 2010-2011 GUAN Xue-tao > * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 as > - * published by the Free Software Foundation. > + * This program is licensed under the terms of the GNU GPL, version 2 or > + * later. See the COPYING file in the top-level directory. > */ > #include "def-helper.h" > > diff --git a/target-unicore32/op_helper.c b/target-unicore32/op_helper.c > index 638a020..9fc2b1f 100644 > --- a/target-unicore32/op_helper.c > +++ b/target-unicore32/op_helper.c > @@ -3,9 +3,8 @@ > * > * Copyright (C) 2010-2011 GUAN Xue-tao > * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 as > - * published by the Free Software Foundation. > + * This program is licensed under the terms of the GNU GPL, version 2 or > + * later. See the COPYING file in the top-level directory. > */ > #include "cpu.h" > #include "dyngen-exec.h" > diff --git a/target-unicore32/translate.c b/target-unicore32/translate.c > index 3b3ba16..c01e636 100644 > --- a/target-unicore32/translate.c > +++ b/target-unicore32/translate.c > @@ -3,9 +3,8 @@ > * > * Copyright (C) 2010-2011 GUAN Xue-tao > * > - * This program is free software; you can redistribute it and/or modify > - * it under the terms of the GNU General Public License version 2 as > - * published by the Free Software Foundation. > + * This program is licensed under the terms of the GNU GPL, version 2 or > + * later. See the COPYING file in the top-level directory. > */ > #include <stdarg.h> > #include <stdlib.h> > -- > 1.7.7 >
Am 14.03.2012 02:39, schrieb Andreas Färber: > Adopt the license text suggested by Guan Xue-tao for all files except > helper.c, to which Anthony Liguori (IBM) contributed a g_malloc() call. > > Signed-off-by: Andreas Färber <afaerber@suse.de> > Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> > Signed-off-by: Stefan Weil <sw@weilnetz.de> > Signed-off-by: Blue Swirl <blauwirbel@gmail.com> > Signed-off-by: Dor Laor <dlaor@redhat.com> > --- > target-unicore32/cpu.h | 5 ++--- > target-unicore32/helper.h | 5 ++--- > target-unicore32/op_helper.c | 5 ++--- > target-unicore32/translate.c | 5 ++--- > 4 files changed, 8 insertions(+), 12 deletions(-) Ack. I don't really think that my contribution here is large enough that my "Acked-by" or "Signed-off-by" is needed, but if it helps... As far as I know, at least in German law trivial changes don't result in a copyright claim. A global search-and-replace operation which replaces qemu_mallocz by g_malloc0 is trivial and no obstacle for a license change, so helper.c could be changed as well(that's my personal opinion). Regards, Stefan W.
On 03/14/2012 04:09 PM, Stefan Weil wrote: > Am 14.03.2012 02:39, schrieb Andreas Färber: >> Adopt the license text suggested by Guan Xue-tao for all files except >> helper.c, to which Anthony Liguori (IBM) contributed a g_malloc() call. >> >> Signed-off-by: Andreas Färber <afaerber@suse.de> >> Signed-off-by: Guan Xuetao <gxt@mprc.pku.edu.cn> >> Signed-off-by: Stefan Weil <sw@weilnetz.de> >> Signed-off-by: Blue Swirl <blauwirbel@gmail.com> >> Signed-off-by: Dor Laor <dlaor@redhat.com> >> --- >> target-unicore32/cpu.h | 5 ++--- >> target-unicore32/helper.h | 5 ++--- >> target-unicore32/op_helper.c | 5 ++--- >> target-unicore32/translate.c | 5 ++--- >> 4 files changed, 8 insertions(+), 12 deletions(-) > > Ack. I don't really think that my contribution here is large > enough that my "Acked-by" or "Signed-off-by" is needed, > but if it helps... > > As far as I know, at least in German law trivial changes don't > result in a copyright claim. A global search-and-replace operation > which replaces qemu_mallocz by g_malloc0 is trivial and no > obstacle for a license change, so helper.c could be changed as > well(that's my personal opinion). Nack. I don't really want to get into the business of splitting hairs here. We have no pressing reason to relicense to GPLv2+ so let's do it right and get the appropriate SoBs. Regards, Anthony Liguori > > Regards, > Stefan W. >
diff --git a/target-unicore32/cpu.h b/target-unicore32/cpu.h index a3f8589..9cbee7a 100644 --- a/target-unicore32/cpu.h +++ b/target-unicore32/cpu.h @@ -3,9 +3,8 @@ * * Copyright (C) 2010-2011 GUAN Xue-tao * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * This program is licensed under the terms of the GNU GPL, version 2 or + * later. See the COPYING file in the top-level directory. */ #ifndef __CPU_UC32_H__ #define __CPU_UC32_H__ diff --git a/target-unicore32/helper.h b/target-unicore32/helper.h index 615de2a..5aa7de8 100644 --- a/target-unicore32/helper.h +++ b/target-unicore32/helper.h @@ -1,9 +1,8 @@ /* * Copyright (C) 2010-2011 GUAN Xue-tao * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * This program is licensed under the terms of the GNU GPL, version 2 or + * later. See the COPYING file in the top-level directory. */ #include "def-helper.h" diff --git a/target-unicore32/op_helper.c b/target-unicore32/op_helper.c index 638a020..9fc2b1f 100644 --- a/target-unicore32/op_helper.c +++ b/target-unicore32/op_helper.c @@ -3,9 +3,8 @@ * * Copyright (C) 2010-2011 GUAN Xue-tao * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * This program is licensed under the terms of the GNU GPL, version 2 or + * later. See the COPYING file in the top-level directory. */ #include "cpu.h" #include "dyngen-exec.h" diff --git a/target-unicore32/translate.c b/target-unicore32/translate.c index 3b3ba16..c01e636 100644 --- a/target-unicore32/translate.c +++ b/target-unicore32/translate.c @@ -3,9 +3,8 @@ * * Copyright (C) 2010-2011 GUAN Xue-tao * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. + * This program is licensed under the terms of the GNU GPL, version 2 or + * later. See the COPYING file in the top-level directory. */ #include <stdarg.h> #include <stdlib.h>