| Submitter | Xiaofeng Yan |
|---|---|
| Date | April 27, 2012, 8:39 a.m. |
| Message ID | <f0e5fdf02154f91fc9af370dbc3ac2bfff375aff.1335515558.git.xiaofeng.yan@windriver.com> |
| Download | mbox | patch |
| Permalink | /patch/26517/ |
| State | New |
| Headers | show |
Comments
On Fri, 2012-04-27 at 16:39 +0800, Xiaofeng Yan wrote: > From: Xiaofeng Yan <xiaofeng.yan@windriver.com> > > LSB Test Suite complain "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 > > [YOCTO #2284] > > Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> > --- > meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | 5 +++-- > 1 files changed, 3 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..3000c79 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 Your patch will leave it enabled in the non-lsb case under many circumstances. How about something like: @@ -28,10 +28,13 @@ 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)}" + FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${libdir}/lib*.so.*" I'd also like to split the library into a separate package. Cheers, Richard
On 2012?04?27? 18:58, Richard Purdie wrote: > On Fri, 2012-04-27 at 16:39 +0800, Xiaofeng Yan wrote: >> From: Xiaofeng Yan<xiaofeng.yan@windriver.com> >> >> LSB Test Suite complain "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 >> >> [YOCTO #2284] >> >> Signed-off-by: Xiaofeng Yan<xiaofeng.yan@windriver.com> >> --- >> meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | 5 +++-- >> 1 files changed, 3 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..3000c79 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 > Your patch will leave it enabled in the non-lsb case under many > circumstances. How about something like: > > @@ -28,10 +28,13 @@ 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)}" > + > FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ > ${libdir}/lib*.so.*" > > > I'd also like to split the library into a separate package. got it, thanks for your suggestion. > Cheers, > > Richard > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core >
Patch
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..3000c79 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,10 +28,11 @@ LIBV = "2.10.0" EXTRA_OECONF = "\ --without-libtiff \ --with-libpng \ - --without-x11 \ --disable-introspection \ " +EXTRA_OECONF_append_linuxstdbase = " ${@base_contains('DISTRO_FEATURES', 'x11', '--with-x11', '--without-x11', d)}" + FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ ${libdir}/lib*.so.*"