diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2015-04-08 14:40:45 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-09 19:48:00 +0100 |
| commit | f5d189b80a1fd7187f47678935f9a584ccff8d0a (patch) | |
| tree | 78e50df28d69a5a9dc659021b3b7b0aa1288f896 /meta | |
| parent | 87429d37e72b1fd2f329d693b4d1b1229a90e0a2 (diff) | |
| download | openembedded-core-f5d189b80a1fd7187f47678935f9a584ccff8d0a.tar.gz openembedded-core-f5d189b80a1fd7187f47678935f9a584ccff8d0a.tar.bz2 openembedded-core-f5d189b80a1fd7187f47678935f9a584ccff8d0a.zip | |
pango: fix postinst
* merge postinst_prologue with the append in the do_split_packages call
Now we can call correct pango-querymodules binary and respect D
variable, otherwise we're trying to regenerate it on host which fails:
pango-module-basic-fc.postinst: line 17: /usr/bin/pango-querymodules:
No such file or directory
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-graphics/pango/pango.inc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc index b59d33d14f..df0fdf679a 100644 --- a/meta/recipes-graphics/pango/pango.inc +++ b/meta/recipes-graphics/pango/pango.inc @@ -46,12 +46,12 @@ EXTRA_OECONF = "--disable-introspection \ LEAD_SONAME = "libpango-1.0*" LIBV = "1.8.0" -postinst_prologue() { +pango_postinst() { if ! [ -e $D${sysconfdir}/pango ] ; then mkdir -p $D${sysconfdir}/pango fi -if [ "x$D" != "x" ]; then +if [ -n "$D" ]; then ${@qemu_run_binary(d, '$D','${bindir}/${MLPREFIX}pango-querymodules')} \ $D${libdir}/pango/${LIBV}/modules/*.so \ > $D${sysconfdir}/pango/${MLPREFIX}pango.modules 2>/dev/null @@ -61,6 +61,8 @@ if [ "x$D" != "x" ]; then sed -i -e "s:$D::" $D${sysconfdir}/pango/${MLPREFIX}pango.modules exit 0 +else + ${bindir}/${MLPREFIX}pango-querymodules > /etc/pango/${MLPREFIX}pango.modules fi } @@ -79,11 +81,11 @@ do_install_append () { python populate_packages_prepend () { - prologue = d.getVar("postinst_prologue", True) + pango_postinst = d.getVar("pango_postinst", True) modules_root = d.expand('${libdir}/pango/${LIBV}/modules') - do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + '${bindir}/${MLPREFIX}pango-querymodules > /etc/pango/${MLPREFIX}pango.modules') + do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', pango_postinst) } FILES_${PN} = "${sysconfdir}/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}" |