[OE-core] [PATCH] pango: use qemu to generate pango.modules during rootfs construction
Saul Wold
sgw at linux.intel.com
Thu Sep 8 01:12:11 UTC 2011
On 08/31/2011 08:35 AM, Phil Blundell wrote:
> This allows pango to be installed in an image with read-only-rootfs.
>
> Signed-off-by: Phil Blundell<philb at gnu.org>
> ---
> meta/recipes-graphics/pango/pango.inc | 11 +++++++----
> meta/recipes-graphics/pango/pango_1.28.4.bb | 2 +-
> 2 files changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
> index a8e99e2..ff3f5dd 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 68ab700..33eac21 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"
>
Merged but we found a problem with qemux86-64, a bug was filed and you
should have received an email
Thanks
Sau!
More information about the Openembedded-core
mailing list