[OE-core] [PATCH] pango: Fix postinst

[Saul Wold]

On 02/27/2014 10:20 PM, Martin Jansa wrote:
> * do_split_packages was appending call to
>    ${bindir}/${MLPREFIX}pango-querymodules
>    without $D prefix or test if $D is empty, so it was always
>    failing on buildhostis without pango-querymodules and such
>    failure is fatal when rootfs is read-only (do_rootfs fails
>    because some packages weren't configured)
>
> Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
> ---
>   meta/recipes-graphics/pango/pango.inc | 14 +++++++++-----
>   1 file changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/meta/recipes-graphics/pango/pango.inc b/meta/recipes-graphics/pango/pango.inc
> index 17006d3..5fddff9 100644
> --- a/meta/recipes-graphics/pango/pango.inc
> +++ b/meta/recipes-graphics/pango/pango.inc
> @@ -42,21 +42,25 @@ EXTRA_OECONF = "--disable-introspection \
>   LEAD_SONAME = "libpango-1.0*"
>   LIBV = "1.8.0"
>
> -postinst_prologue() {
> +pango_postinst() {
>   if ! [ -e $D${sysconfdir}/pango ] ; then
>   	mkdir -p $D${sysconfdir}/pango
>   fi
>
> -if [ "x$D" != "x" ]; then
> +if [ -n "$D" ]; then
>   	${@qemu_run_binary(d, '$D','${bindir}/${MLPREFIX}pango-querymodules')} \
>   		$D${libdir}/pango/${LIBV}/modules/*.so \
>   		> $D${sysconfdir}/pango/${MLPREFIX}pango.modules 2>/dev/null
>
> -	[ $? -ne 0 ] && exit 1
> +	if [ $? -ne 0 ] ; then
> +		echo "qemu_run_binary call ${bindir}/${MLPREFIX}pango-querymodules $D${libdir}/pango/${LIBV}/modules/*.so > $D${sysconfdir}/pango/${MLPREFIX}pango.modules failed"
> +		exit 1
>
Are you missing a 'fi' here?

I got an error during parsing:
> ERROR: ExpansionError during parsing /home/sgw/yocto/poky/meta/recipes-graphics/pango/pango_1.36.2.bb: Failure expanding variable pango_postinst: ShellSyntaxError: None
> followed by:
>


Sau!

>   	sed -i -e "s:$D::" $D${sysconfdir}/pango/${MLPREFIX}pango.modules
>
>   	exit 0
> +else
> +	${bindir}/${MLPREFIX}pango-querymodules > /etc/pango/${MLPREFIX}pango.modules
>   fi
>   }
>
> @@ -68,11 +72,11 @@ do_install_append () {
>
>
>   python populate_packages_prepend () {
> -    prologue = d.getVar("postinst_prologue", True)
> +    pango_postinst = d.getVar("pango_postinst", True)
>
>       modules_root = d.expand('${libdir}/pango/${LIBV}/modules')
>
> -    do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', prologue + '${bindir}/${MLPREFIX}pango-querymodules > /etc/pango/${MLPREFIX}pango.modules')
> +    do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', pango_postinst)
>   }
>
>   FILES_${PN} = "${sysconfdir}/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}"
>