Patchwork [12/69] atk: Update LICENSE field version

login
register
mail settings
Submitter chase maupin
Date May 14, 2012, 4:09 p.m.
Message ID <1337011834-24879-13-git-send-email-Chase.Maupin@ti.com>
Download mbox | patch
Permalink /patch/27705/
State Accepted
Commit 3c6858e71e22c466c7d3f9abbb0cea118f8be5b4
Headers show

Comments

chase maupin - May 14, 2012, 4:09 p.m.
* Update LICENSE field version from generic LGPL to GPLv2+ and
  LGPLv2+ to reflect the real license version.
* This change was based on setting in oe-core as well as code
  inspection.

Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
---
 recipes/atk/atk_1.30.0.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Elizabeth Flanagan - May 14, 2012, 5:30 p.m.
On Mon, May 14, 2012 at 9:09 AM, Chase Maupin <Chase.Maupin@ti.com> wrote:
> * Update LICENSE field version from generic LGPL to GPLv2+ and
>  LGPLv2+ to reflect the real license version.
> * This change was based on setting in oe-core as well as code
>  inspection.
>
> Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
> ---
>  recipes/atk/atk_1.30.0.bb |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/recipes/atk/atk_1.30.0.bb b/recipes/atk/atk_1.30.0.bb
> index b3505bf..23c6685 100644
> --- a/recipes/atk/atk_1.30.0.bb
> +++ b/recipes/atk/atk_1.30.0.bb
> @@ -1,9 +1,9 @@
>  DESCRIPTION = "An accessibility toolkit for GNOME."
>  SECTION = "x11/libs"
>  PRIORITY = "optional"
> -LICENSE = "LGPL"
> +LICENSE = "GPLv2+ LGPLv2+"

This should be:

LICENSE = "GPLv2+ & LGPLv2+"

or whatever the operator is (Most likely & or |)

The license field needs to be ast parsable in order for the license
system to work.

-b

>
> -PR = "r1"
> +PR = "r2"
>
>  inherit gnome
>
> --
> 1.7.0.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
chase maupin - May 14, 2012, 5:49 p.m.
> -----Original Message-----
> From: Flanagan, Elizabeth [mailto:elizabeth.flanagan@intel.com]
> Sent: Monday, May 14, 2012 12:30 PM
> To: openembedded-devel@lists.openembedded.org
> Cc: Maupin, Chase
> Subject: Re: [oe] [PATCH 12/69] atk: Update LICENSE field version
> 
> On Mon, May 14, 2012 at 9:09 AM, Chase Maupin
> <Chase.Maupin@ti.com> wrote:
> > * Update LICENSE field version from generic LGPL to GPLv2+ and
> >  LGPLv2+ to reflect the real license version.
> > * This change was based on setting in oe-core as well as code
> >  inspection.
> >
> > Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
> > ---
> >  recipes/atk/atk_1.30.0.bb |    4 ++--
> >  1 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/recipes/atk/atk_1.30.0.bb
> b/recipes/atk/atk_1.30.0.bb
> > index b3505bf..23c6685 100644
> > --- a/recipes/atk/atk_1.30.0.bb
> > +++ b/recipes/atk/atk_1.30.0.bb
> > @@ -1,9 +1,9 @@
> >  DESCRIPTION = "An accessibility toolkit for GNOME."
> >  SECTION = "x11/libs"
> >  PRIORITY = "optional"
> > -LICENSE = "LGPL"
> > +LICENSE = "GPLv2+ LGPLv2+"
> 
> This should be:
> 
> LICENSE = "GPLv2+ & LGPLv2+"
> 
> or whatever the operator is (Most likely & or |)

I know that & works in oe-core, but when I use this in oe-classic I get build errors like:

NOTE: Running task 432 of 513 (ID: 1, /home/a0271661/projects/arago-4.7/arago-oe-dev/recipes/atk/atk_1.30.0.bb, do_patch)
ERROR: Function SRC_DISTRIBUTECOMMAND failed
NOTE: Task failed: ('function SRC_DISTRIBUTECOMMAND failed', '/home/a0271661/projects/arago-4.7/arago-tmp/work/armv7a-arago-linux-gnueabi/atk-1.30.0-r2/temp/log.SRC_DISTRIBUTECOMMAND.27742')
ERROR: Logfile of failure stored in: /home/a0271661/projects/arago-4.7/arago-tmp/work/armv7a-arago-linux-gnueabi/atk-1.30.0-r2/temp/log.SRC_DISTRIBUTECOMMAND.27742
Log data follows:
| /home/a0271661/projects/arago-4.7/arago-tmp/work/armv7a-arago-linux-gnueabi/atk-1.30.0-r2/temp/run.SRC_DISTRIBUTECOMMAND.27742: line 1288: /atk: No such file or directory
| ERROR: Function SRC_DISTRIBUTECOMMAND failed
NOTE: package atk-1.30.0-r2: task do_distribute_sources: Failed
ERROR: TaskFailed event exception, aborting
ERROR: Build of /home/a0271661/projects/arago-4.7/arago-oe-dev/recipes/atk/atk_1.30.0.bb do_distribute_sources failed
ERROR: Task 16 (/home/a0271661/projects/arago-4.7/arago-oe-dev/recipes/atk/atk_1.30.0.bb, do_distribute_sources) failed with exit code 1

The line (1288) that is causing this error looks like:

cd /home/a0271661/projects/arago-4.7/arago-tmp/deploy/glibc/sources/&/atk
SRC_DISTRIBUTECOMMAND

Looking at other recipes I noticed that when they had multiple licenses they used a space separated list and in the case of an or license option |.

Any input on this would be appreciated.  I don't believe / is right because that would make it look like a path for the classes that use the license.

> 
> The license field needs to be ast parsable in order for the
> license
> system to work.
> 
> -b
> 
> >
> > -PR = "r1"
> > +PR = "r2"
> >
> >  inherit gnome
> >
> > --
> > 1.7.0.4
> >
> >
> > _______________________________________________
> > Openembedded-devel mailing list
> > Openembedded-devel@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-
> bin/mailman/listinfo/openembedded-devel
> 
> 
> 
> --
> Elizabeth Flanagan
> Yocto Project
> Build and Release
Martin Jansa - May 14, 2012, 6:13 p.m.
On Mon, May 14, 2012 at 05:49:26PM +0000, Maupin, Chase wrote:
> > -----Original Message-----
> > From: Flanagan, Elizabeth [mailto:elizabeth.flanagan@intel.com]
> > Sent: Monday, May 14, 2012 12:30 PM
> > To: openembedded-devel@lists.openembedded.org
> > Cc: Maupin, Chase
> > Subject: Re: [oe] [PATCH 12/69] atk: Update LICENSE field version
> > 
> > On Mon, May 14, 2012 at 9:09 AM, Chase Maupin
> > <Chase.Maupin@ti.com> wrote:
> > > * Update LICENSE field version from generic LGPL to GPLv2+ and
> > >  LGPLv2+ to reflect the real license version.
> > > * This change was based on setting in oe-core as well as code
> > >  inspection.
> > >
> > > Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
> > > ---
> > >  recipes/atk/atk_1.30.0.bb |    4 ++--
> > >  1 files changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/recipes/atk/atk_1.30.0.bb
> > b/recipes/atk/atk_1.30.0.bb
> > > index b3505bf..23c6685 100644
> > > --- a/recipes/atk/atk_1.30.0.bb
> > > +++ b/recipes/atk/atk_1.30.0.bb
> > > @@ -1,9 +1,9 @@
> > >  DESCRIPTION = "An accessibility toolkit for GNOME."
> > >  SECTION = "x11/libs"
> > >  PRIORITY = "optional"
> > > -LICENSE = "LGPL"
> > > +LICENSE = "GPLv2+ LGPLv2+"
> > 
> > This should be:
> > 
> > LICENSE = "GPLv2+ & LGPLv2+"
> > 
> > or whatever the operator is (Most likely & or |)
> 
> I know that & works in oe-core, but when I use this in oe-classic I get build errors like:
> 
> NOTE: Running task 432 of 513 (ID: 1, /home/a0271661/projects/arago-4.7/arago-oe-dev/recipes/atk/atk_1.30.0.bb, do_patch)
> ERROR: Function SRC_DISTRIBUTECOMMAND failed
> NOTE: Task failed: ('function SRC_DISTRIBUTECOMMAND failed', '/home/a0271661/projects/arago-4.7/arago-tmp/work/armv7a-arago-linux-gnueabi/atk-1.30.0-r2/temp/log.SRC_DISTRIBUTECOMMAND.27742')
> ERROR: Logfile of failure stored in: /home/a0271661/projects/arago-4.7/arago-tmp/work/armv7a-arago-linux-gnueabi/atk-1.30.0-r2/temp/log.SRC_DISTRIBUTECOMMAND.27742
> Log data follows:
> | /home/a0271661/projects/arago-4.7/arago-tmp/work/armv7a-arago-linux-gnueabi/atk-1.30.0-r2/temp/run.SRC_DISTRIBUTECOMMAND.27742: line 1288: /atk: No such file or directory
> | ERROR: Function SRC_DISTRIBUTECOMMAND failed
> NOTE: package atk-1.30.0-r2: task do_distribute_sources: Failed
> ERROR: TaskFailed event exception, aborting
> ERROR: Build of /home/a0271661/projects/arago-4.7/arago-oe-dev/recipes/atk/atk_1.30.0.bb do_distribute_sources failed
> ERROR: Task 16 (/home/a0271661/projects/arago-4.7/arago-oe-dev/recipes/atk/atk_1.30.0.bb, do_distribute_sources) failed with exit code 1
> 
> The line (1288) that is causing this error looks like:
> 
> cd /home/a0271661/projects/arago-4.7/arago-tmp/deploy/glibc/sources/&/atk
> SRC_DISTRIBUTECOMMAND
> 
> Looking at other recipes I noticed that when they had multiple licenses they used a space separated list and in the case of an or license option |.
> 
> Any input on this would be appreciated.  I don't believe / is right because that would make it look like a path for the classes that use the license.

yes, special characters like '+'
http://git.openembedded.org/openembedded/commit/?id=1c25e6c73b219dc8077780567fb0fb515092b5cf
or '&' or even spaces
http://git.openembedded.org/openembedded/commit/?id=819fa4c451ea5a811b8dd78bbcbb38dc38c68aa4

break oe-classic, more about it
http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-May/032579.html

Cheers,

> 
> > 
> > The license field needs to be ast parsable in order for the
> > license
> > system to work.
> > 
> > -b
> > 
> > >
> > > -PR = "r1"
> > > +PR = "r2"
> > >
> > >  inherit gnome
> > >
> > > --
> > > 1.7.0.4
> > >
> > >
> > > _______________________________________________
> > > Openembedded-devel mailing list
> > > Openembedded-devel@lists.openembedded.org
> > > http://lists.linuxtogo.org/cgi-
> > bin/mailman/listinfo/openembedded-devel
> > 
> > 
> > 
> > --
> > Elizabeth Flanagan
> > Yocto Project
> > Build and Release
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Tom Rini - May 14, 2012, 7:11 p.m.
On Mon, May 14, 2012 at 08:13:29PM +0200, Martin Jansa wrote:
> On Mon, May 14, 2012 at 05:49:26PM +0000, Maupin, Chase wrote:
> > > -----Original Message-----
> > > From: Flanagan, Elizabeth [mailto:elizabeth.flanagan@intel.com]
> > > Sent: Monday, May 14, 2012 12:30 PM
> > > To: openembedded-devel@lists.openembedded.org
> > > Cc: Maupin, Chase
> > > Subject: Re: [oe] [PATCH 12/69] atk: Update LICENSE field version
> > > 
> > > On Mon, May 14, 2012 at 9:09 AM, Chase Maupin
> > > <Chase.Maupin@ti.com> wrote:
> > > > * Update LICENSE field version from generic LGPL to GPLv2+ and
> > > > ?LGPLv2+ to reflect the real license version.
> > > > * This change was based on setting in oe-core as well as code
> > > > ?inspection.
> > > >
> > > > Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
> > > > ---
> > > > ?recipes/atk/atk_1.30.0.bb | ? ?4 ++--
> > > > ?1 files changed, 2 insertions(+), 2 deletions(-)
> > > >
> > > > diff --git a/recipes/atk/atk_1.30.0.bb
> > > b/recipes/atk/atk_1.30.0.bb
> > > > index b3505bf..23c6685 100644
> > > > --- a/recipes/atk/atk_1.30.0.bb
> > > > +++ b/recipes/atk/atk_1.30.0.bb
> > > > @@ -1,9 +1,9 @@
> > > > ?DESCRIPTION = "An accessibility toolkit for GNOME."
> > > > ?SECTION = "x11/libs"
> > > > ?PRIORITY = "optional"
> > > > -LICENSE = "LGPL"
> > > > +LICENSE = "GPLv2+ LGPLv2+"
> > > 
> > > This should be:
> > > 
> > > LICENSE = "GPLv2+ & LGPLv2+"
> > > 
> > > or whatever the operator is (Most likely & or |)
> > 
> > I know that & works in oe-core, but when I use this in oe-classic I get build errors like:
> > 
> > NOTE: Running task 432 of 513 (ID: 1, /home/a0271661/projects/arago-4.7/arago-oe-dev/recipes/atk/atk_1.30.0.bb, do_patch)
> > ERROR: Function SRC_DISTRIBUTECOMMAND failed
> > NOTE: Task failed: ('function SRC_DISTRIBUTECOMMAND failed', '/home/a0271661/projects/arago-4.7/arago-tmp/work/armv7a-arago-linux-gnueabi/atk-1.30.0-r2/temp/log.SRC_DISTRIBUTECOMMAND.27742')
> > ERROR: Logfile of failure stored in: /home/a0271661/projects/arago-4.7/arago-tmp/work/armv7a-arago-linux-gnueabi/atk-1.30.0-r2/temp/log.SRC_DISTRIBUTECOMMAND.27742
> > Log data follows:
> > | /home/a0271661/projects/arago-4.7/arago-tmp/work/armv7a-arago-linux-gnueabi/atk-1.30.0-r2/temp/run.SRC_DISTRIBUTECOMMAND.27742: line 1288: /atk: No such file or directory
> > | ERROR: Function SRC_DISTRIBUTECOMMAND failed
> > NOTE: package atk-1.30.0-r2: task do_distribute_sources: Failed
> > ERROR: TaskFailed event exception, aborting
> > ERROR: Build of /home/a0271661/projects/arago-4.7/arago-oe-dev/recipes/atk/atk_1.30.0.bb do_distribute_sources failed
> > ERROR: Task 16 (/home/a0271661/projects/arago-4.7/arago-oe-dev/recipes/atk/atk_1.30.0.bb, do_distribute_sources) failed with exit code 1
> > 
> > The line (1288) that is causing this error looks like:
> > 
> > cd /home/a0271661/projects/arago-4.7/arago-tmp/deploy/glibc/sources/&/atk
> > SRC_DISTRIBUTECOMMAND
> > 
> > Looking at other recipes I noticed that when they had multiple licenses they used a space separated list and in the case of an or license option |.
> > 
> > Any input on this would be appreciated.  I don't believe / is right because that would make it look like a path for the classes that use the license.
> 
> yes, special characters like '+'
> http://git.openembedded.org/openembedded/commit/?id=1c25e6c73b219dc8077780567fb0fb515092b5cf
> or '&' or even spaces
> http://git.openembedded.org/openembedded/commit/?id=819fa4c451ea5a811b8dd78bbcbb38dc38c68aa4
> 
> break oe-classic, more about it
> http://lists.linuxtogo.org/pipermail/openembedded-devel/2011-May/032579.html

I'm OK saying that the data just needs to be human-readable and correct
in oe-classic and correct and fully tool-usable in oe-core/etc.

Patch

diff --git a/recipes/atk/atk_1.30.0.bb b/recipes/atk/atk_1.30.0.bb
index b3505bf..23c6685 100644
--- a/recipes/atk/atk_1.30.0.bb
+++ b/recipes/atk/atk_1.30.0.bb
@@ -1,9 +1,9 @@ 
 DESCRIPTION = "An accessibility toolkit for GNOME."
 SECTION = "x11/libs"
 PRIORITY = "optional"
-LICENSE = "LGPL"
+LICENSE = "GPLv2+ LGPLv2+"
 
-PR = "r1"
+PR = "r2"
 
 inherit gnome