mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

pango: fix postinst

Browse Source 
* 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>
This commit is contained in:
Martin Jansa
2015-04-08 14:40:45 +02:00
committed by Richard Purdie
parent 0928eb7d84
commit 36e064a547
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-graphics/pango/pango.inc
+6 -4
View File
@@ -46,12 +46,12 @@ EXTRA_OECONF = "--disable-introspection \
LEAD_SONAME = "libpango-1.0*" LEAD_SONAME = "libpango-1.0*"
LIBV = "1.8.0" LIBV = "1.8.0"
postinst_prologue() { pango_postinst() {
if ! [ -e $D${sysconfdir}/pango ] ; then if ! [ -e $D${sysconfdir}/pango ] ; then
mkdir -p $D${sysconfdir}/pango mkdir -p $D${sysconfdir}/pango
fi fi
if [ "x$D" != "x" ]; then if [ -n "$D" ]; then
${@qemu_run_binary(d, '$D','${bindir}/${MLPREFIX}pango-querymodules')} \ ${@qemu_run_binary(d, '$D','${bindir}/${MLPREFIX}pango-querymodules')} \
$D${libdir}/pango/${LIBV}/modules/*.so \ $D${libdir}/pango/${LIBV}/modules/*.so \
> $D${sysconfdir}/pango/${MLPREFIX}pango.modules 2>/dev/null > $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 sed -i -e "s:$D::" $D${sysconfdir}/pango/${MLPREFIX}pango.modules
exit 0 exit 0
else
${bindir}/${MLPREFIX}pango-querymodules > /etc/pango/${MLPREFIX}pango.modules
fi fi
} }
@@ -79,11 +81,11 @@ do_install_append () {
python populate_packages_prepend () { 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') 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}" FILES_${PN} = "${sysconfdir}/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}"