Patchwork [1/1] pixbuff.bbclass: check for gdk-pixbuf-query-loaders errors

login
register
mail settings
Submitter Joe Slater
Date April 14, 2014, 1:22 a.m.
Message ID <1397438532-16886-1-git-send-email-jslater@windriver.com>
Download mbox | patch
Permalink /patch/70559/
State New
Headers show

Comments

Joe Slater - April 14, 2014, 1:22 a.m.
If we do not see all the bits we need during populate_sysroot_setscene,
we do not want to keep quiet about it and let somebody get screwed
later.  By error exiting, we let bitbake try to recover by
rebuilding the package.  This will, hopefully, fix any dependency
issues, etc, but if not, at least we tried.

Signed-off-by: Joe Slater <jslater@windriver.com>
---
 meta/classes/pixbufcache.bbclass |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
Ross Burton - April 22, 2014, 2:07 p.m.
This needs rebasing onto current master as there's an attempt at
failing fatally in master (which then won't get noticed, due to the
issue this fixes).

Ross

On 14 April 2014 02:22, Joe Slater <jslater@windriver.com> wrote:
> If we do not see all the bits we need during populate_sysroot_setscene,
> we do not want to keep quiet about it and let somebody get screwed
> later.  By error exiting, we let bitbake try to recover by
> rebuilding the package.  This will, hopefully, fix any dependency
> issues, etc, but if not, at least we tried.
>
> Signed-off-by: Joe Slater <jslater@windriver.com>
> ---
>  meta/classes/pixbufcache.bbclass |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)
>
> diff --git a/meta/classes/pixbufcache.bbclass b/meta/classes/pixbufcache.bbclass
> index 414fd30..edbb948 100644
> --- a/meta/classes/pixbufcache.bbclass
> +++ b/meta/classes/pixbufcache.bbclass
> @@ -53,7 +53,10 @@ SSTATEPOSTINSTFUNCS_append_class-native = " pixbufcache_sstate_postinst"
>  pixbufcache_sstate_postinst() {
>         if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]
>         then
> -               gdk-pixbuf-query-loaders --update-cache
> +               if ! gdk-pixbuf-query-loaders --update-cache
> +               then
> +                       exit 1
> +               fi
>         fi
>  }
>
> --
> 1.7.3.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/classes/pixbufcache.bbclass b/meta/classes/pixbufcache.bbclass
index 414fd30..edbb948 100644
--- a/meta/classes/pixbufcache.bbclass
+++ b/meta/classes/pixbufcache.bbclass
@@ -53,7 +53,10 @@  SSTATEPOSTINSTFUNCS_append_class-native = " pixbufcache_sstate_postinst"
 pixbufcache_sstate_postinst() {
 	if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]
 	then
-		gdk-pixbuf-query-loaders --update-cache
+		if ! gdk-pixbuf-query-loaders --update-cache
+		then
+			exit 1
+		fi
 	fi
 }