summaryrefslogtreecommitdiffstats
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:54:13 +0100
commitb8b4a92625c07a7f65e12bf7007ace8a506d9a05 (patch)
tree47e90ea1b506f8d98ecb820bc2364c7ff255d57c /meta
parent168b89a7cd62e5017a2fa2a09a117b275da1c590 (diff)
downloadpoky-b8b4a92625c07a7f65e12bf7007ace8a506d9a05.tar.gz
pango: use qemu to generate pango.modules during rootfs construction
This allows pango to be installed in an image with read-only-rootfs. (From OE-Core rev: 62381fd3a135318794f14dc3740b04facd32446e) Signed-off-by: Phil Blundell <philb@gnu.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.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 a8e99e2f6d..ff3f5dd549 100644
--- a/meta/recipes-graphics/pango/pango.inc
+++ b/meta/recipes-graphics/pango/pango.inc
@@ -10,13 +10,13 @@ SECTION = "libs"
10LICENSE = "LGPL" 10LICENSE = "LGPL"
11 11
12X11DEPENDS = "virtual/libx11 libxft" 12X11DEPENDS = "virtual/libx11 libxft"
13DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native cairo ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}" 13DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv gtk-doc-native cairo qemu-native ${@base_contains('DISTRO_FEATURES', 'x11', '${X11DEPENDS}', '', d)}"
14 14
15PACKAGES_DYNAMIC = "pango-module-*" 15PACKAGES_DYNAMIC = "pango-module-*"
16 16
17RRECOMMENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'x11', 'pango-module-basic-x', '', d)} pango-module-basic-fc" 17RRECOMMENDS_${PN} = "${@base_contains('DISTRO_FEATURES', 'x11', 'pango-module-basic-x', '', d)} pango-module-basic-fc"
18 18
19inherit gnome 19inherit gnome qemu
20 20
21EXTRA_AUTORECONF = "" 21EXTRA_AUTORECONF = ""
22 22
@@ -33,9 +33,12 @@ LIBV = "1.6.0"
33 33
34postinst_prologue() { 34postinst_prologue() {
35if [ "x$D" != "x" ]; then 35if [ "x$D" != "x" ]; then
36 exit 1 36 if [ ! -f "$D${sysconfdir}/pango/pango.modules" ]; then
37 mkdir -p $D${sysconfdir}/pango
38 PSEUDO_RELOADED=YES ${@qemu_target_binary(d)} -L $D $D${bindir}/pango-querymodules > "$D${sysconfdir}/pango/pango.modules"
39 fi
40 exit 0
37fi 41fi
38
39} 42}
40 43
41python populate_packages_prepend () { 44python 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 68ab700c8c..33eac217f3 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
2 2
3LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" 3LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7"
4 4
5PR = "r1" 5PR = "r4"
6 6
7SRC_URI += "file://no-tests.patch" 7SRC_URI += "file://no-tests.patch"
8 8