Message ID | d3939f8f64b50aca9bf23e9c017160d32cd814f6.1326355020.git.xiaofeng.yan@windriver.com |
---|---|
State | New |
Headers | show |
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc index b428b9d..e103fab 100644 --- a/meta/recipes-graphics/pango/pango.inc +++ b/meta/recipes-graphics/pango/pango.inc @@ -46,6 +46,11 @@ fi } +# Command "pango-querymodules > /etc/pango/pango.modules" needs this directory. +do_install_prepend() { + install -d ${D}/${sysconfdir}/pango +} + python populate_packages_prepend () { prologue = d.getVar("postinst_prologue", 1) @@ -54,6 +59,6 @@ python populate_packages_prepend () { do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules > /etc/pango/pango.modules') } -FILES_${PN} = "/etc/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}" +FILES_${PN} += "${syscondir}/* ${bindir}/* ${libdir}/libpango*${SOLIBS}" FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug" FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
On 01/12/2012 12:12 AM, Xiaofeng Yan wrote: > From: Xiaofeng Yan<xiaofeng.yan@windriver.com> > > Command "pango-querymodules> /etc/pango/pango.modules" can't work when \ > starting up yocto because of no directory "/etc/pango". It will cause \ > messy code when gtk-demo running. > > [YOCTO #1674] > > Signed-off-by: Xiaofeng Yan<xiaofeng.yan@windriver.com> > --- > meta/recipes-graphics/pango/pango.inc | 7 ++++++- > 1 files changed, 6 insertions(+), 1 deletions(-) > > diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc > index b428b9d..e103fab 100644 > --- a/meta/recipes-graphics/pango/pango.inc > +++ b/meta/recipes-graphics/pango/pango.inc > @@ -46,6 +46,11 @@ fi > > } > > +# Command "pango-querymodules> /etc/pango/pango.modules" needs this directory. > +do_install_prepend() { > + install -d ${D}/${sysconfdir}/pango > +} > + > python populate_packages_prepend () { > prologue = d.getVar("postinst_prologue", 1) > > @@ -54,6 +59,6 @@ python populate_packages_prepend () { > do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + 'pango-querymodules> /etc/pango/pango.modules') > } > > -FILES_${PN} = "/etc/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}" > +FILES_${PN} += "${syscondir}/* ${bindir}/* ${libdir}/libpango*${SOLIBS}" Is this too general? Should it be ${sysconfdir}/pango? Sau! > FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug" > FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la"
On Thu, 2012-01-12 at 12:30 -0800, Saul Wold wrote: > On 01/12/2012 12:12 AM, Xiaofeng Yan wrote: > > -FILES_${PN} = "/etc/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}" > > +FILES_${PN} += "${syscondir}/* ${bindir}/* ${libdir}/libpango*${SOLIBS}" > Is this too general? Should it be ${sysconfdir}/pango? "${sysconfdir}" is in the default FILES_${PN} anyway. (Also, "${syscondir}/*" won't match anything since there is no such variable.) So this change is largely benign but it won't accomplish much. p.
On 2012?01?13? 04:33, Phil Blundell wrote: > On Thu, 2012-01-12 at 12:30 -0800, Saul Wold wrote: >> On 01/12/2012 12:12 AM, Xiaofeng Yan wrote: >>> -FILES_${PN} = "/etc/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}" >>> +FILES_${PN} += "${syscondir}/* ${bindir}/* ${libdir}/libpango*${SOLIBS}" >> Is this too general? Should it be ${sysconfdir}/pango? > "${sysconfdir}" is in the default FILES_${PN} anyway. I will remove this changes. > (Also, > "${syscondir}/*" won't match anything since there is no such variable.) > > So this change is largely benign but it won't accomplish much. > > p. > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core >