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:04:55 +0100 |
| commit | 9f439bced3c1d2503a14942da1a3c729c0226f6c (patch) | |
| tree | 584c5322d6b0eb1fbc4ab1e01e8ef401f95d6a23 /meta | |
| parent | a5aeb873b943300e18493031ffa9e9f8ab56c2d2 (diff) | |
| download | openembedded-core-9f439bced3c1d2503a14942da1a3c729c0226f6c.tar.gz openembedded-core-9f439bced3c1d2503a14942da1a3c729c0226f6c.tar.bz2 openembedded-core-9f439bced3c1d2503a14942da1a3c729c0226f6c.tar.xz openembedded-core-9f439bced3c1d2503a14942da1a3c729c0226f6c.zip | |
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.
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-graphics/pango/pango.inc | 11 | ||||
| -rw-r--r-- | meta/recipes-graphics/pango/pango_1.28.4.bb | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc index ff3f5dd54..a8e99e2f6 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 () { diff --git a/meta/recipes-graphics/pango/pango_1.28.4.bb b/meta/recipes-graphics/pango/pango_1.28.4.bb index 33eac217f..68ab700c8 100644 --- a/meta/recipes-graphics/pango/pango_1.28.4.bb +++ b/meta/recipes-graphics/pango/pango_1.28.4.bb @@ -2,7 +2,7 @@ require pango.inc LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" -PR = "r4" +PR = "r1" SRC_URI += "file://no-tests.patch" |