sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

Revert "pango: use qemu to generate pango.modules during rootfs construction" 

This reverts commit 62381fd3a135318794f14dc3740b04facd32446e.

This commit has issues with the rpm rootfs generation which need
resolving before it can be accepted.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2011-09-13 17:04:55 +01:00
parent cba78fed34
commit aa203e4605
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
meta/recipes-graphics/pango/pango.inc
View File

@ -10,13 +10,13 @@ SECTION = "libs"
LICENSE = "LGPL"
X11DEPENDS = "virtual/libx11 libxft"
DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native cairo qemu-native ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native cairo ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
PACKAGES_DYNAMIC = "pango-module-*"
RRECOMMENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'x11', 'pango-module-basic-x', '', d)} pango-module-basic-fc"
inherit gnome qemu
inherit gnome
EXTRA_AUTORECONF = ""
@ -33,12 +33,9 @@ LIBV = "1.6.0"
postinst_prologue() {
if [ "x$D" != "x" ]; then
if [ ! -f "$D${sysconfdir}/pango/pango.modules" ]; then
mkdir -p $D${sysconfdir}/pango
PSEUDO_RELOADED=YES ${@qemu_target_binary(d)} -L $D $D${bindir}/pango-querymodules > "$D${sysconfdir}/pango/pango.modules"
fi
exit 0
exit 1
fi
}
python populate_packages_prepend () {

2
meta/recipes-graphics/pango/pango_1.28.4.bb
View File

@ -2,7 +2,7 @@ require pango.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
PR = "r4"
PR = "r1"
SRC_URI += "file://no-tests.patch"