Patchwork [v2,1/1] atk: add native / disable introspection / merge atk.inc->recipe / change license

login
register
mail settings
Submitter Andreas Müller
Date Jan. 29, 2012, midnight
Message ID <1327795253-24794-2-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/20273/
State Accepted
Commit a69108ea388fce9034ecc8670f1149fabae55e1b
Headers show

Comments

Andreas Müller - Jan. 29, 2012, midnight
Native support currently is appended in meta-oe. Native build failed with:

| /usr/share/gir-1.0/GLib-2.0.gir:9:1: error: Unsupported version '1.1'
| /usr/share/gir-1.0/GLib-2.0.gir:9:39: error: Unsupported version '1.1'
| error parsing file Atk-1.0.gir: Failed to parse included gir GLib-2.0
| make[3]: *** [Atk-1.0.typelib] Error 1

build tested in meta-oe / angstrom environment

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 meta/recipes-support/atk/atk.inc      |   13 -------------
 meta/recipes-support/atk/atk_2.2.0.bb |   17 +++++++++++++----
 2 files changed, 13 insertions(+), 17 deletions(-)
 delete mode 100644 meta/recipes-support/atk/atk.inc
Saul Wold - Jan. 30, 2012, 5:01 p.m.
On 01/28/2012 04:00 PM, Andreas Müller wrote:
> Native support currently is appended in meta-oe. Native build failed with:
>
> | /usr/share/gir-1.0/GLib-2.0.gir:9:1: error: Unsupported version '1.1'
> | /usr/share/gir-1.0/GLib-2.0.gir:9:39: error: Unsupported version '1.1'
> | error parsing file Atk-1.0.gir: Failed to parse included gir GLib-2.0
> | make[3]: *** [Atk-1.0.typelib] Error 1
>
> build tested in meta-oe / angstrom environment
>
> Signed-off-by: Andreas Müller<schnitzeltony@googlemail.com>
> ---
>   meta/recipes-support/atk/atk.inc      |   13 -------------
>   meta/recipes-support/atk/atk_2.2.0.bb |   17 +++++++++++++----
>   2 files changed, 13 insertions(+), 17 deletions(-)
>   delete mode 100644 meta/recipes-support/atk/atk.inc
>
> diff --git a/meta/recipes-support/atk/atk.inc b/meta/recipes-support/atk/atk.inc
> deleted file mode 100644
> index 6a4fef6..0000000
> --- a/meta/recipes-support/atk/atk.inc
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -DESCRIPTION = "An accessibility toolkit for GNOME."
> -HOMEPAGE = "http://live.gnome.org/GAP/"
> -BUGTRACKER = "https://bugzilla.gnome.org/"
> -
> -LICENSE = "LGPLv2&  LGPLv2+"
> -
> -SECTION = "x11/libs"
> -
> -DEPENDS = "glib-2.0 gtk-doc-native"
> -
> -inherit autotools pkgconfig
> -
> -EXTRA_OECONF = "--disable-glibtest"
> diff --git a/meta/recipes-support/atk/atk_2.2.0.bb b/meta/recipes-support/atk/atk_2.2.0.bb
> index 0d657b5..74e7288 100644
> --- a/meta/recipes-support/atk/atk_2.2.0.bb
> +++ b/meta/recipes-support/atk/atk_2.2.0.bb
> @@ -1,14 +1,23 @@
> -require atk.inc
> +DESCRIPTION = "An accessibility toolkit for GNOME."
> +HOMEPAGE = "http://live.gnome.org/GAP/"
> +BUGTRACKER = "https://bugzilla.gnome.org/"
> +SECTION = "x11/libs"
>
> -PR = "r1"
> +LICENSE = "GPLv2+&  LGPLv2+"
Not sure what you changed here, but you did not fix this as Khem 
suggested.  Also, if you are making LICENSE changes the note you 
included in your 00 Patch email should really be in the Commit message 
instead.

Thanks
	Sau!

>   LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
>                       file://atk/atkutil.c;endline=20;md5=db21b0bdbef9da4dc6eb122debc9f9bc \
>                       file://atk/atk.h;endline=20;md5=c58238d688c24387376d6c69d06248a7"
> +PR = "r2"
>
> -SRC_URI = "http://download.gnome.org/sources/atk/2.2/${BPN}-${PV}.tar.bz2"
> +DEPENDS = "glib-2.0 gtk-doc-native"
> +
> +inherit autotools pkgconfig
>
> +SRC_URI = "http://download.gnome.org/sources/atk/2.2/${BPN}-${PV}.tar.bz2"
>   SRC_URI[md5sum] = "4894e9b04f0a9f1c37a624a1e8d6d73f"
>   SRC_URI[sha256sum] = "d201e3f5808aef0b1aec2277bfa61074f68863e405428adb57a73aab5c838450"
>
> +BBCLASSEXTEND = "native"
>
> -
> +EXTRA_OECONF = "--disable-glibtest \
> +                --disable-introspection"
Andreas Müller - Jan. 30, 2012, 6:55 p.m.
On Mon, Jan 30, 2012 at 6:01 PM, Saul Wold <sgw@linux.intel.com> wrote:
> On 01/28/2012 04:00 PM, Andreas Müller wrote:
>>
>> Native support currently is appended in meta-oe. Native build failed with:
>>
>> | /usr/share/gir-1.0/GLib-2.0.gir:9:1: error: Unsupported version '1.1'
>> | /usr/share/gir-1.0/GLib-2.0.gir:9:39: error: Unsupported version '1.1'
>> | error parsing file Atk-1.0.gir: Failed to parse included gir GLib-2.0
>> | make[3]: *** [Atk-1.0.typelib] Error 1
>>
>> build tested in meta-oe / angstrom environment
>>
>> Signed-off-by: Andreas Müller<schnitzeltony@googlemail.com>
>> ---
>>  meta/recipes-support/atk/atk.inc      |   13 -------------
>>  meta/recipes-support/atk/atk_2.2.0.bb |   17 +++++++++++++----
>>  2 files changed, 13 insertions(+), 17 deletions(-)
>>  delete mode 100644 meta/recipes-support/atk/atk.inc
>>
>> diff --git a/meta/recipes-support/atk/atk.inc
>> b/meta/recipes-support/atk/atk.inc
>> deleted file mode 100644
>> index 6a4fef6..0000000
>> --- a/meta/recipes-support/atk/atk.inc
>> +++ /dev/null
>> @@ -1,13 +0,0 @@
>> -DESCRIPTION = "An accessibility toolkit for GNOME."
>> -HOMEPAGE = "http://live.gnome.org/GAP/"
>> -BUGTRACKER = "https://bugzilla.gnome.org/"
>> -
>> -LICENSE = "LGPLv2&  LGPLv2+"
>>
>> -
>> -SECTION = "x11/libs"
>> -
>> -DEPENDS = "glib-2.0 gtk-doc-native"
>> -
>> -inherit autotools pkgconfig
>> -
>> -EXTRA_OECONF = "--disable-glibtest"
>> diff --git a/meta/recipes-support/atk/atk_2.2.0.bb
>> b/meta/recipes-support/atk/atk_2.2.0.bb
>> index 0d657b5..74e7288 100644
>> --- a/meta/recipes-support/atk/atk_2.2.0.bb
>> +++ b/meta/recipes-support/atk/atk_2.2.0.bb
>> @@ -1,14 +1,23 @@
>> -require atk.inc
>> +DESCRIPTION = "An accessibility toolkit for GNOME."
>> +HOMEPAGE = "http://live.gnome.org/GAP/"
>> +BUGTRACKER = "https://bugzilla.gnome.org/"
>> +SECTION = "x11/libs"
>>
>> -PR = "r1"
>> +LICENSE = "GPLv2+&  LGPLv2+"
>
> Not sure what you changed here, but you did not fix this as Khem suggested.

After Khem's comment I checked the files mentioned in LIC_FILES_CHKSUM
and changed
from

LICENSE = "LGPLv2&  LGPLv2+"

to

LICENSE = "GPLv2+&  LGPLv2+"

and mentioned this for information in cover-letter for everybody to
cross-check. Since my initial patch did not touch license and I don't
exactly know how to handle this case what shall I do for V3:

1. Keep LICENSE and move the cover letter explanations to commit message - or
2. Set LGPLv2.1+ as Khem mentioned

>  Also, if you are making LICENSE changes the note you included in your 00
> Patch email should really be in the Commit message instead.
>
> Thanks
>        Sau!

Andreas
Elizabeth Flanagan - Feb. 1, 2012, 1:07 a.m.
On Mon, Jan 30, 2012 at 9:01 AM, Saul Wold <sgw@linux.intel.com> wrote:
> On 01/28/2012 04:00 PM, Andreas Müller wrote:
>>
>> Native support currently is appended in meta-oe. Native build failed with:
>>
>> | /usr/share/gir-1.0/GLib-2.0.gir:9:1: error: Unsupported version '1.1'
>> | /usr/share/gir-1.0/GLib-2.0.gir:9:39: error: Unsupported version '1.1'
>> | error parsing file Atk-1.0.gir: Failed to parse included gir GLib-2.0
>> | make[3]: *** [Atk-1.0.typelib] Error 1
>>
>> build tested in meta-oe / angstrom environment
>>
>> Signed-off-by: Andreas Müller<schnitzeltony@googlemail.com>
>> ---
>>  meta/recipes-support/atk/atk.inc      |   13 -------------
>>  meta/recipes-support/atk/atk_2.2.0.bb |   17 +++++++++++++----
>>  2 files changed, 13 insertions(+), 17 deletions(-)
>>  delete mode 100644 meta/recipes-support/atk/atk.inc
>>
>> diff --git a/meta/recipes-support/atk/atk.inc
>> b/meta/recipes-support/atk/atk.inc
>> deleted file mode 100644
>> index 6a4fef6..0000000
>> --- a/meta/recipes-support/atk/atk.inc
>> +++ /dev/null
>> @@ -1,13 +0,0 @@
>> -DESCRIPTION = "An accessibility toolkit for GNOME."
>> -HOMEPAGE = "http://live.gnome.org/GAP/"
>> -BUGTRACKER = "https://bugzilla.gnome.org/"
>> -
>> -LICENSE = "LGPLv2&  LGPLv2+"
>>
>> -
>> -SECTION = "x11/libs"
>> -
>> -DEPENDS = "glib-2.0 gtk-doc-native"
>> -
>> -inherit autotools pkgconfig
>> -
>> -EXTRA_OECONF = "--disable-glibtest"
>> diff --git a/meta/recipes-support/atk/atk_2.2.0.bb
>> b/meta/recipes-support/atk/atk_2.2.0.bb
>> index 0d657b5..74e7288 100644
>> --- a/meta/recipes-support/atk/atk_2.2.0.bb
>> +++ b/meta/recipes-support/atk/atk_2.2.0.bb
>> @@ -1,14 +1,23 @@
>> -require atk.inc
>> +DESCRIPTION = "An accessibility toolkit for GNOME."
>> +HOMEPAGE = "http://live.gnome.org/GAP/"
>> +BUGTRACKER = "https://bugzilla.gnome.org/"
>> +SECTION = "x11/libs"
>>
>> -PR = "r1"
>> +LICENSE = "GPLv2+&  LGPLv2+"
>
> Not sure what you changed here, but you did not fix this as Khem suggested.
>  Also, if you are making LICENSE changes the note you included in your 00
> Patch email should really be in the Commit message instead.

Few things here:

- LICENSE needs to be ast parsable. It should be:

LICENSE = "GPL-2.0+ & LGPL-2.1+"

- LGPLv2.1. It really does matter, IMHO.

For some reason OBS says this is only LGPL-2.1+ I haven't looked at it
too closely, but COPYING is pretty clear here.

-b

>
> Thanks
>        Sau!
>
>
>>  LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
>>
>>  file://atk/atkutil.c;endline=20;md5=db21b0bdbef9da4dc6eb122debc9f9bc \
>>
>>  file://atk/atk.h;endline=20;md5=c58238d688c24387376d6c69d06248a7"
>> +PR = "r2"
>>
>> -SRC_URI =
>> "http://download.gnome.org/sources/atk/2.2/${BPN}-${PV}.tar.bz2"
>> +DEPENDS = "glib-2.0 gtk-doc-native"
>> +
>> +inherit autotools pkgconfig
>>
>> +SRC_URI =
>> "http://download.gnome.org/sources/atk/2.2/${BPN}-${PV}.tar.bz2"
>>  SRC_URI[md5sum] = "4894e9b04f0a9f1c37a624a1e8d6d73f"
>>  SRC_URI[sha256sum] =
>> "d201e3f5808aef0b1aec2277bfa61074f68863e405428adb57a73aab5c838450"
>>
>> +BBCLASSEXTEND = "native"
>>
>> -
>> +EXTRA_OECONF = "--disable-glibtest \
>> +                --disable-introspection"
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Andreas Müller - Feb. 1, 2012, 9:20 a.m.
On Wed, Feb 1, 2012 at 2:07 AM, Flanagan, Elizabeth
<elizabeth.flanagan@intel.com> wrote:
>
> - LICENSE needs to be ast parsable. It should be:
>
> LICENSE = "GPL-2.0+ & LGPL-2.1+"
I grepped around: We have exactly ONE hit for each ( GPL-2.0+ /
LGPL-2.1+ ) in oe-core. This approach does not seem common to me..
>
> - LGPLv2.1. It really does matter, IMHO.
>
> For some reason OBS says this is only LGPL-2.1+ I haven't looked at it
> too closely, but COPYING is pretty clear here.
>
> -b
>
Sorry to say so: The original patch did not touch license at all. It
just moved it from inc -> bb. I feel a bit hijacked here and loose
motivation of further versions of this patch...

Andreas
Saul Wold - Feb. 2, 2012, 5:49 p.m.
On 02/01/2012 01:20 AM, Andreas Müller wrote:
> On Wed, Feb 1, 2012 at 2:07 AM, Flanagan, Elizabeth
> <elizabeth.flanagan@intel.com>  wrote:
>>
>> - LICENSE needs to be ast parsable. It should be:
>>
>> LICENSE = "GPL-2.0+&  LGPL-2.1+"
> I grepped around: We have exactly ONE hit for each ( GPL-2.0+ /
> LGPL-2.1+ ) in oe-core. This approach does not seem common to me..
>>
>> - LGPLv2.1. It really does matter, IMHO.
>>
>> For some reason OBS says this is only LGPL-2.1+ I haven't looked at it
>> too closely, but COPYING is pretty clear here.
>>
>> -b
>>
> Sorry to say so: The original patch did not touch license at all. It
> just moved it from inc ->  bb. I feel a bit hijacked here and loose
> motivation of further versions of this patch...
>
Andreas,

I am sorry you feel this way, I appreciate the work the that you and all 
the community members contribute to this project. We are not trying to 
hijack anyone one here. One of the key values that OE-Core and Yocto 
Project are trying to provide is a best in class with the metadata, and 
a very important part of that is the LICENSE values, when we notice it's 
wrong, we want to correct it.

We will pull the v2 change and then Beth will correct the LICENSE meta-data.

Thanks for your work!

Sau!

> Andreas
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Elizabeth Flanagan - Feb. 2, 2012, 6:34 p.m.
On Wed, Feb 1, 2012 at 1:20 AM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> On Wed, Feb 1, 2012 at 2:07 AM, Flanagan, Elizabeth
> <elizabeth.flanagan@intel.com> wrote:
>>
>> - LICENSE needs to be ast parsable. It should be:
>>
>> LICENSE = "GPL-2.0+ & LGPL-2.1+"
> I grepped around: We have exactly ONE hit for each ( GPL-2.0+ /
> LGPL-2.1+ ) in oe-core. This approach does not seem common to me..

It's not, but it really should be. I've been lax of late calling these out.

>>
>> - LGPLv2.1. It really does matter, IMHO.
>>
>> For some reason OBS says this is only LGPL-2.1+ I haven't looked at it
>> too closely, but COPYING is pretty clear here.
>>
>> -b
>>
> Sorry to say so: The original patch did not touch license at all. It
> just moved it from inc -> bb. I feel a bit hijacked here and loose
> motivation of further versions of this patch...
>

I apologize. That wasn't my intent as I didn't see the move from inc
to bb. I'll correct LICENSE after the pull.

-b

> Andreas
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Richard Purdie - Feb. 2, 2012, 6:38 p.m.
On Sun, 2012-01-29 at 01:00 +0100, Andreas Müller wrote:
> Native support currently is appended in meta-oe. Native build failed with:
> 
> | /usr/share/gir-1.0/GLib-2.0.gir:9:1: error: Unsupported version '1.1'
> | /usr/share/gir-1.0/GLib-2.0.gir:9:39: error: Unsupported version '1.1'
> | error parsing file Atk-1.0.gir: Failed to parse included gir GLib-2.0
> | make[3]: *** [Atk-1.0.typelib] Error 1
> 
> build tested in meta-oe / angstrom environment
> 
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  meta/recipes-support/atk/atk.inc      |   13 -------------
>  meta/recipes-support/atk/atk_2.2.0.bb |   17 +++++++++++++----
>  2 files changed, 13 insertions(+), 17 deletions(-)
>  delete mode 100644 meta/recipes-support/atk/atk.inc

Merged to master, thanks.

Richard

Patch

diff --git a/meta/recipes-support/atk/atk.inc b/meta/recipes-support/atk/atk.inc
deleted file mode 100644
index 6a4fef6..0000000
--- a/meta/recipes-support/atk/atk.inc
+++ /dev/null
@@ -1,13 +0,0 @@ 
-DESCRIPTION = "An accessibility toolkit for GNOME."
-HOMEPAGE = "http://live.gnome.org/GAP/"
-BUGTRACKER = "https://bugzilla.gnome.org/"
-
-LICENSE = "LGPLv2 & LGPLv2+"
-
-SECTION = "x11/libs"
-
-DEPENDS = "glib-2.0 gtk-doc-native"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-glibtest"
diff --git a/meta/recipes-support/atk/atk_2.2.0.bb b/meta/recipes-support/atk/atk_2.2.0.bb
index 0d657b5..74e7288 100644
--- a/meta/recipes-support/atk/atk_2.2.0.bb
+++ b/meta/recipes-support/atk/atk_2.2.0.bb
@@ -1,14 +1,23 @@ 
-require atk.inc
+DESCRIPTION = "An accessibility toolkit for GNOME."
+HOMEPAGE = "http://live.gnome.org/GAP/"
+BUGTRACKER = "https://bugzilla.gnome.org/"
+SECTION = "x11/libs"
 
-PR = "r1"
+LICENSE = "GPLv2+ & LGPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
                     file://atk/atkutil.c;endline=20;md5=db21b0bdbef9da4dc6eb122debc9f9bc \
                     file://atk/atk.h;endline=20;md5=c58238d688c24387376d6c69d06248a7"
+PR = "r2"
 
-SRC_URI = "http://download.gnome.org/sources/atk/2.2/${BPN}-${PV}.tar.bz2"
+DEPENDS = "glib-2.0 gtk-doc-native"
+
+inherit autotools pkgconfig
 
+SRC_URI = "http://download.gnome.org/sources/atk/2.2/${BPN}-${PV}.tar.bz2"
 SRC_URI[md5sum] = "4894e9b04f0a9f1c37a624a1e8d6d73f"
 SRC_URI[sha256sum] = "d201e3f5808aef0b1aec2277bfa61074f68863e405428adb57a73aab5c838450"
 
+BBCLASSEXTEND = "native"
 
-
+EXTRA_OECONF = "--disable-glibtest \
+                --disable-introspection"