diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-13 17:04:55 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-13 17:06:17 +0100 |
| commit | aa203e460583388006f8ed12cbe0442e86c598eb (patch) | |
| tree | ef9d2be7aaf6d80e512fa80a5fa53f7e6351bf74 /meta/recipes-graphics/pango/pango.inc | |
| parent | cba78fed34318bc1fda2af11e85aebb0467948a8 (diff) | |
| download | ast2050-yocto-poky-aa203e460583388006f8ed12cbe0442e86c598eb.zip ast2050-yocto-poky-aa203e460583388006f8ed12cbe0442e86c598eb.tar.gz | |
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>
Diffstat (limited to 'meta/recipes-graphics/pango/pango.inc')
| -rw-r--r-- | meta/recipes-graphics/pango/pango.inc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc index ff3f5dd..a8e99e2 100644 --- a/meta/recipes-graphics/pango/pango.inc +++ b/meta/recipes-graphics/pango/pango.inc @@ -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 () { |
