summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2011-08-31 16:35:31 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-09-07 22:28:33 +0100
commit62381fd3a135318794f14dc3740b04facd32446e (patch)
tree496a8cff19b54af09c716d01cc3dad1aef3e3dc1 /meta
parentcb8efc0e1ec00892b46325aabfb1b4020a46c078 (diff)
downloadopenembedded-core-62381fd3a135318794f14dc3740b04facd32446e.tar.gz
openembedded-core-62381fd3a135318794f14dc3740b04facd32446e.tar.bz2
openembedded-core-62381fd3a135318794f14dc3740b04facd32446e.tar.xz
openembedded-core-62381fd3a135318794f14dc3740b04facd32446e.zip
pango: use qemu to generate pango.modules during rootfs construction
This allows pango to be installed in an image with read-only-rootfs. Signed-off-by: Phil Blundell <philb@gnu.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/pango/pango.inc11
-rw-r--r--meta/recipes-graphics/pango/pango_1.28.4.bb2
2 files changed, 8 insertions, 5 deletions
diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
index a8e99e2f6..ff3f5dd54 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 ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native cairo qemu-native ${@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
+inherit gnome qemu
EXTRA_AUTORECONF = ""
@@ -33,9 +33,12 @@ LIBV = "1.6.0"
postinst_prologue() {
if [ "x$D" != "x" ]; then
- exit 1
+ 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
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 68ab700c8..33eac217f 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 = "r1"
+PR = "r4"
SRC_URI += "file://no-tests.patch"