* [PATCH 0/2]gdk-pixbuf: Add --with-x11 when building lsb image
@ 2012-05-11 7:23 Xiaofeng Yan
2012-05-11 7:23 ` [PATCH 1/2] task-core-lsb: Add libgdk-pixbuf-xlib to core-image-lsb Xiaofeng Yan
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Xiaofeng Yan @ 2012-05-11 7:23 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
This is V3 for fixing bug 2284. I made some modification according to Richard's suggestion.
The following was Richard's suggestion:
We should be using the linuxstdbase override and also make it
conditional on x11 being in DISTRO_FEATURES.
Split xlib to a single pakcage.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: xiaofeng/2284
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/2284
Thanks,
Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
Xiaofeng Yan (2):
task-core-lsb: Add libgdk-pixbuf-xlib to core-image-lsb
gdk-pixbuf: Add --with-x11 when building lsb image
meta/recipes-extended/tasks/task-core-lsb.bb | 7 +++----
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | 11 +++++++++--
2 files changed, 12 insertions(+), 6 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] task-core-lsb: Add libgdk-pixbuf-xlib to core-image-lsb
2012-05-11 7:23 [PATCH 0/2]gdk-pixbuf: Add --with-x11 when building lsb image Xiaofeng Yan
@ 2012-05-11 7:23 ` Xiaofeng Yan
2012-05-11 7:23 ` [PATCH 2/2] gdk-pixbuf: Add --with-x11 when building lsb image Xiaofeng Yan
2012-05-11 17:40 ` [PATCH 0/2]gdk-pixbuf: " Saul Wold
2 siblings, 0 replies; 7+ messages in thread
From: Xiaofeng Yan @ 2012-05-11 7:23 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
LSB Test Suite complains "No library libgdk_pixbuf_xlib-2.0.so.0" \
which are created by gdk-pixbuf_2.24.1.bb.
So add this library to core-image-lsb for passing lsb test.
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
meta/recipes-extended/tasks/task-core-lsb.bb | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-extended/tasks/task-core-lsb.bb b/meta/recipes-extended/tasks/task-core-lsb.bb
index 2767196..350bc7d 100644
--- a/meta/recipes-extended/tasks/task-core-lsb.bb
+++ b/meta/recipes-extended/tasks/task-core-lsb.bb
@@ -3,7 +3,7 @@
#
DESCRIPTION = "Create Small Image Tasks"
-PR = "r7"
+PR = "r8"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
@@ -169,15 +169,14 @@ RDEPENDS_task-core-lsb-graphic-add = "\
gdk-pixbuf-loader-ico \
gdk-pixbuf-loader-bmp \
gdk-pixbuf-loader-ani \
- liberation-fonts \
+ gdk-pixbuf-xlib \
+ liberation-fonts \
gtk+ \
atk \
libasound \
${@base_contains("DISTRO_FEATURES", "opengl", "libqtopengl4", "", d)} \
"
-# mesa-dri
-
RDEPENDS_task-core-lsb-runtime-add = "\
ldd \
pam-plugin-wheel \
--
1.7.0.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] gdk-pixbuf: Add --with-x11 when building lsb image
2012-05-11 7:23 [PATCH 0/2]gdk-pixbuf: Add --with-x11 when building lsb image Xiaofeng Yan
2012-05-11 7:23 ` [PATCH 1/2] task-core-lsb: Add libgdk-pixbuf-xlib to core-image-lsb Xiaofeng Yan
@ 2012-05-11 7:23 ` Xiaofeng Yan
2012-05-12 5:41 ` Saul Wold
2012-05-11 17:40 ` [PATCH 0/2]gdk-pixbuf: " Saul Wold
2 siblings, 1 reply; 7+ messages in thread
From: Xiaofeng Yan @ 2012-05-11 7:23 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
LSB Test Suite complains "No library libgdk_pixbuf_xlib-2.0.so.0" \
because of having "--without-x11" for gdk-pixbuf_2.24.1.bb.
Use the linuxstdbase override and also make it conditional on x11 \
being in DISTRO_FEATURES for passing lsb test.
Split libgdk_pixbuf_xlib to a single package.
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
index e31f717..a88700b 100644
--- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
+++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
@@ -19,7 +19,7 @@ SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${
SRC_URI[md5sum] = "72f39b34b20f68148c1609bd27415412"
SRC_URI[sha256sum] = "da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1"
-PR = "r0"
+PR = "r1"
inherit autotools pkgconfig gettext
@@ -28,9 +28,16 @@ LIBV = "2.10.0"
EXTRA_OECONF = "\
--without-libtiff \
--with-libpng \
- --without-x11 \
+ ${X11DEPENDS} \
--disable-introspection \
"
+X11DEPENDS = "--without-x11"
+X11DEPENDS_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x11', '--without-x11', d)}"
+
+PACKAGES =+ "${PN}-xlib"
+
+FILES_${PN}-xlib = "${libdir}/*pixbuf_xlib*${SOLIBS}"
+RPROVIDES_${PN}-xlib = "${PN}-xlib"
FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
${libdir}/lib*.so.*"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 0/2]gdk-pixbuf: Add --with-x11 when building lsb image
2012-05-11 7:23 [PATCH 0/2]gdk-pixbuf: Add --with-x11 when building lsb image Xiaofeng Yan
2012-05-11 7:23 ` [PATCH 1/2] task-core-lsb: Add libgdk-pixbuf-xlib to core-image-lsb Xiaofeng Yan
2012-05-11 7:23 ` [PATCH 2/2] gdk-pixbuf: Add --with-x11 when building lsb image Xiaofeng Yan
@ 2012-05-11 17:40 ` Saul Wold
2 siblings, 0 replies; 7+ messages in thread
From: Saul Wold @ 2012-05-11 17:40 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 05/11/2012 12:23 AM, Xiaofeng Yan wrote:
> From: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>
> This is V3 for fixing bug 2284. I made some modification according to Richard's suggestion.
>
> The following was Richard's suggestion:
> We should be using the linuxstdbase override and also make it
> conditional on x11 being in DISTRO_FEATURES.
> Split xlib to a single pakcage.
>
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
> Branch: xiaofeng/2284
> Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=xiaofeng/2284
>
> Thanks,
> Xiaofeng Yan<xiaofeng.yan@windriver.com>
> ---
>
>
> Xiaofeng Yan (2):
> task-core-lsb: Add libgdk-pixbuf-xlib to core-image-lsb
> gdk-pixbuf: Add --with-x11 when building lsb image
>
> meta/recipes-extended/tasks/task-core-lsb.bb | 7 +++----
> meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | 11 +++++++++--
> 2 files changed, 12 insertions(+), 6 deletions(-)
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] gdk-pixbuf: Add --with-x11 when building lsb image
2012-05-11 7:23 ` [PATCH 2/2] gdk-pixbuf: Add --with-x11 when building lsb image Xiaofeng Yan
@ 2012-05-12 5:41 ` Saul Wold
2012-05-12 9:58 ` Richard Purdie
2012-05-14 15:12 ` Mark Hatle
0 siblings, 2 replies; 7+ messages in thread
From: Saul Wold @ 2012-05-12 5:41 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 05/11/2012 12:23 AM, Xiaofeng Yan wrote:
> From: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>
> LSB Test Suite complains "No library libgdk_pixbuf_xlib-2.0.so.0" \
> because of having "--without-x11" for gdk-pixbuf_2.24.1.bb.
> Use the linuxstdbase override and also make it conditional on x11 \
> being in DISTRO_FEATURES for passing lsb test.
> Split libgdk_pixbuf_xlib to a single package.
>
> Signed-off-by: Xiaofeng Yan<xiaofeng.yan@windriver.com>
> ---
> meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | 11 +++++++++--
> 1 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
> index e31f717..a88700b 100644
> --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
> +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
> @@ -19,7 +19,7 @@ SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${
> SRC_URI[md5sum] = "72f39b34b20f68148c1609bd27415412"
> SRC_URI[sha256sum] = "da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1"
>
> -PR = "r0"
> +PR = "r1"
>
> inherit autotools pkgconfig gettext
>
> @@ -28,9 +28,16 @@ LIBV = "2.10.0"
> EXTRA_OECONF = "\
> --without-libtiff \
> --with-libpng \
> - --without-x11 \
> + ${X11DEPENDS} \
> --disable-introspection \
> "
> +X11DEPENDS = "--without-x11"
> +X11DEPENDS_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x11', '--without-x11', d)}"
> +
I hate to ask this after this has already been merged, but should this
really have been more generic or do other packages need to be fixed
since we are seeing failures in the non-LSB case of this new -xlib
package being depended on.
| gdk-pixbuf-xlib is needed by gdk-pixbuf-loader-png-2.24.1-r1.armv5te
| gdk-pixbuf-xlib is needed by gdk-pixbuf-loader-jpeg-2.24.1-r1.armv5te
| gdk-pixbuf-xlib is needed by gdk-pixbuf-loader-xpm-2.24.1-r1.armv5te
| gdk-pixbuf-xlib is needed by gdk-pixbuf-loader-gif-2.24.1-r1.armv5te
Sau!
> +PACKAGES =+ "${PN}-xlib"
> +
> +FILES_${PN}-xlib = "${libdir}/*pixbuf_xlib*${SOLIBS}"
> +RPROVIDES_${PN}-xlib = "${PN}-xlib"
>
> FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
> ${libdir}/lib*.so.*"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] gdk-pixbuf: Add --with-x11 when building lsb image
2012-05-12 5:41 ` Saul Wold
@ 2012-05-12 9:58 ` Richard Purdie
2012-05-14 15:12 ` Mark Hatle
1 sibling, 0 replies; 7+ messages in thread
From: Richard Purdie @ 2012-05-12 9:58 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Fri, 2012-05-11 at 22:41 -0700, Saul Wold wrote:
> On 05/11/2012 12:23 AM, Xiaofeng Yan wrote:
> > From: Xiaofeng Yan<xiaofeng.yan@windriver.com>
> >
> > LSB Test Suite complains "No library libgdk_pixbuf_xlib-2.0.so.0" \
> > because of having "--without-x11" for gdk-pixbuf_2.24.1.bb.
> > Use the linuxstdbase override and also make it conditional on x11 \
> > being in DISTRO_FEATURES for passing lsb test.
> > Split libgdk_pixbuf_xlib to a single package.
> >
> > Signed-off-by: Xiaofeng Yan<xiaofeng.yan@windriver.com>
> > ---
> > meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | 11 +++++++++--
> > 1 files changed, 9 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
> > index e31f717..a88700b 100644
> > --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
> > +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
> > @@ -19,7 +19,7 @@ SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${
> > SRC_URI[md5sum] = "72f39b34b20f68148c1609bd27415412"
> > SRC_URI[sha256sum] = "da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1"
> >
> > -PR = "r0"
> > +PR = "r1"
> >
> > inherit autotools pkgconfig gettext
> >
> > @@ -28,9 +28,16 @@ LIBV = "2.10.0"
> > EXTRA_OECONF = "\
> > --without-libtiff \
> > --with-libpng \
> > - --without-x11 \
> > + ${X11DEPENDS} \
> > --disable-introspection \
> > "
> > +X11DEPENDS = "--without-x11"
> > +X11DEPENDS_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x11', '--without-x11', d)}"
> > +
> I hate to ask this after this has already been merged, but should this
> really have been more generic or do other packages need to be fixed
> since we are seeing failures in the non-LSB case of this new -xlib
> package being depended on.
>
> | gdk-pixbuf-xlib is needed by gdk-pixbuf-loader-png-2.24.1-r1.armv5te
> | gdk-pixbuf-xlib is needed by gdk-pixbuf-loader-jpeg-2.24.1-r1.armv5te
> | gdk-pixbuf-xlib is needed by gdk-pixbuf-loader-xpm-2.24.1-r1.armv5te
> | gdk-pixbuf-xlib is needed by gdk-pixbuf-loader-gif-2.24.1-r1.armv5te
This is a bug in package.bbclass:
From 2006:
http://git.yoctoproject.org/cgit.cgi/poky/commit/meta/classes/package.bbclass?id=2af3b213e554d34d7f17e41cd9f5abfe842f6a08
http://git.yoctoproject.org/cgit.cgi/poky/commit/meta/classes/package.bbclass?id=77597031696448e691831ddca735c8fd096788f5
So 6 years ago I put a bandaid on this. That code is simply nuts and I
think its time to remove/rework it. We could change it to use ${PN} I
guess which would be more likely to work and I can't see it breaking too
much...
Cheers,
Richard
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] gdk-pixbuf: Add --with-x11 when building lsb image
2012-05-12 5:41 ` Saul Wold
2012-05-12 9:58 ` Richard Purdie
@ 2012-05-14 15:12 ` Mark Hatle
1 sibling, 0 replies; 7+ messages in thread
From: Mark Hatle @ 2012-05-14 15:12 UTC (permalink / raw)
To: openembedded-core
On 5/12/12 12:41 AM, Saul Wold wrote:
> On 05/11/2012 12:23 AM, Xiaofeng Yan wrote:
>> From: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>>
>> LSB Test Suite complains "No library libgdk_pixbuf_xlib-2.0.so.0" \
>> because of having "--without-x11" for gdk-pixbuf_2.24.1.bb.
>> Use the linuxstdbase override and also make it conditional on x11 \
>> being in DISTRO_FEATURES for passing lsb test.
>> Split libgdk_pixbuf_xlib to a single package.
>>
>> Signed-off-by: Xiaofeng Yan<xiaofeng.yan@windriver.com>
>> ---
>> meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | 11 +++++++++--
>> 1 files changed, 9 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
>> index e31f717..a88700b 100644
>> --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
>> +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb
>> @@ -19,7 +19,7 @@ SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${
>> SRC_URI[md5sum] = "72f39b34b20f68148c1609bd27415412"
>> SRC_URI[sha256sum] = "da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1"
>>
>> -PR = "r0"
>> +PR = "r1"
>>
>> inherit autotools pkgconfig gettext
>>
>> @@ -28,9 +28,16 @@ LIBV = "2.10.0"
>> EXTRA_OECONF = "\
>> --without-libtiff \
>> --with-libpng \
>> - --without-x11 \
>> + ${X11DEPENDS} \
>> --disable-introspection \
>> "
>> +X11DEPENDS = "--without-x11"
>> +X11DEPENDS_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x11', '--without-x11', d)}"
>> +
> I hate to ask this after this has already been merged, but should this
> really have been more generic or do other packages need to be fixed
> since we are seeing failures in the non-LSB case of this new -xlib
> package being depended on.
>
> | gdk-pixbuf-xlib is needed by gdk-pixbuf-loader-png-2.24.1-r1.armv5te
> | gdk-pixbuf-xlib is needed by gdk-pixbuf-loader-jpeg-2.24.1-r1.armv5te
> | gdk-pixbuf-xlib is needed by gdk-pixbuf-loader-xpm-2.24.1-r1.armv5te
> | gdk-pixbuf-xlib is needed by gdk-pixbuf-loader-gif-2.24.1-r1.armv5te
BTW I agree, there is nothing linuxstdbase specific about this check. We have a
distro policy w/ x11, then we should enabled this in gdk-pixbuf. (The rest of
the bug it looks like Richard has already worked on.)
--Mark
> Sau!
>
>> +PACKAGES =+ "${PN}-xlib"
>> +
>> +FILES_${PN}-xlib = "${libdir}/*pixbuf_xlib*${SOLIBS}"
>> +RPROVIDES_${PN}-xlib = "${PN}-xlib"
>>
>> FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
>> ${libdir}/lib*.so.*"
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-05-14 15:22 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-05-11 7:23 [PATCH 0/2]gdk-pixbuf: Add --with-x11 when building lsb image Xiaofeng Yan
2012-05-11 7:23 ` [PATCH 1/2] task-core-lsb: Add libgdk-pixbuf-xlib to core-image-lsb Xiaofeng Yan
2012-05-11 7:23 ` [PATCH 2/2] gdk-pixbuf: Add --with-x11 when building lsb image Xiaofeng Yan
2012-05-12 5:41 ` Saul Wold
2012-05-12 9:58 ` Richard Purdie
2012-05-14 15:12 ` Mark Hatle
2012-05-11 17:40 ` [PATCH 0/2]gdk-pixbuf: " Saul Wold
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.