summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2015-04-08 14:40:45 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-10 18:10:24 +0100
commit36e064a547c9fc9d5d07813e6de088da4a279c8d (patch)
tree0aed52e4cad3ecb9a40810e80f28414c8e9cf268
parent0928eb7d84df2443e81478a7eabd16e40c99705b (diff)
downloadpoky-36e064a547c9fc9d5d07813e6de088da4a279c8d.tar.gz
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 (From OE-Core rev: f5d189b80a1fd7187f47678935f9a584ccff8d0a) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/pango/pango.inc10
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 \
46LEAD_SONAME = "libpango-1.0*" 46LEAD_SONAME = "libpango-1.0*"
47LIBV = "1.8.0" 47LIBV = "1.8.0"
48 48
49postinst_prologue() { 49pango_postinst() {
50if ! [ -e $D${sysconfdir}/pango ] ; then 50if ! [ -e $D${sysconfdir}/pango ] ; then
51 mkdir -p $D${sysconfdir}/pango 51 mkdir -p $D${sysconfdir}/pango
52fi 52fi
53 53
54if [ "x$D" != "x" ]; then 54if [ -n "$D" ]; then
55 ${@qemu_run_binary(d, '$D','${bindir}/${MLPREFIX}pango-querymodules')} \ 55 ${@qemu_run_binary(d, '$D','${bindir}/${MLPREFIX}pango-querymodules')} \
56 $D${libdir}/pango/${LIBV}/modules/*.so \ 56 $D${libdir}/pango/${LIBV}/modules/*.so \
57 > $D${sysconfdir}/pango/${MLPREFIX}pango.modules 2>/dev/null 57 > $D${sysconfdir}/pango/${MLPREFIX}pango.modules 2>/dev/null
@@ -61,6 +61,8 @@ if [ "x$D" != "x" ]; then
61 sed -i -e "s:$D::" $D${sysconfdir}/pango/${MLPREFIX}pango.modules 61 sed -i -e "s:$D::" $D${sysconfdir}/pango/${MLPREFIX}pango.modules
62 62
63 exit 0 63 exit 0
64else
65 ${bindir}/${MLPREFIX}pango-querymodules > /etc/pango/${MLPREFIX}pango.modules
64fi 66fi
65} 67}
66 68
@@ -79,11 +81,11 @@ do_install_append () {
79 81
80 82
81python populate_packages_prepend () { 83python populate_packages_prepend () {
82 prologue = d.getVar("postinst_prologue", True) 84 pango_postinst = d.getVar("pango_postinst", True)
83 85
84 modules_root = d.expand('${libdir}/pango/${LIBV}/modules') 86 modules_root = d.expand('${libdir}/pango/${LIBV}/modules')
85 87
86 do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + '${bindir}/${MLPREFIX}pango-querymodules > /etc/pango/${MLPREFIX}pango.modules') 88 do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', pango_postinst)
87} 89}
88 90
89FILES_${PN} = "${sysconfdir}/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}" 91FILES_${PN} = "${sysconfdir}/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}"