[OE-core] [PATCH 3/3] pango.inc: add directory "/etc/pango"

[Koen Kooi]

Op 17 jan. 2012, om 10:11 heeft Khem Raj het volgende geschreven:

> On Sun, Jan 15, 2012 at 8:34 PM, Saul Wold <sgw at linux.intel.com> wrote:
>> On 01/12/2012 11:06 PM, Xiaofeng Yan wrote:
>>> 
>>> From: Xiaofeng Yan<xiaofeng.yan at 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 at 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..06db327 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} += "${bindir}/* ${libdir}/libpango*${SOLIBS}"
>> 
>> This can actually be removed completed since the default for FILES_${PN}
>> includes bindir/* and libdir/lib*${SOLIBS}
>> 
>> I fixed this up in my testing area.
>> 
> 
> Saul
> 
> This seems wrong to me. Since now all the modules will also be bundled in $PN
> whereas you want them in pango-modules-* packages since
> populate_packages_prepend has nothing left to generate out modules
> packages so please reintroduce the FILES_${PN} as it was (note that it
> was overwriting the defaults
> and not appending to it.)

The original problem can also be solved by doing the mkdir in the postinst prologue