diff options
| author |   Joe Slater <jslater@windriver.com> | 2014-04-22 11:00:41 -0700 |
|---|---|---|
| committer |   Saul Wold <sgw@linux.intel.com> | 2014-05-23 09:09:39 -0700 |
| commit | 90492efeacc7645592bbd5c4518f519f732e5f95 (patch) | |
| tree | a3ce2d29435bb5f217e1d1326c17a0bcc2f7c9f9 | |
| parent | 63ce29a48b608f34dd378285a54c24ee83a3a1c7 (diff) | |
| download | openembedded-core-contrib-90492efeacc7645592bbd5c4518f519f732e5f95.tar.gz | |
pixbufcache: add error exit in pixbufcache_sstate_postinst
In order to attempt recovery of a failed populate_sysroot_setscene,
we need to explicitly error exit an SSTATEPOSTINSTFUNC. So, we test
the return value of gdk-pixbuf-query-loaders.
(From OE-Core rev: 17bdb2538e6b723e11afb1079c71363603dba63d)
Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/pixbufcache.bbclass | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/classes/pixbufcache.bbclass b/meta/classes/pixbufcache.bbclass index 922174dffe..b8d75bd38c 100644 --- a/meta/classes/pixbufcache.bbclass +++ b/meta/classes/pixbufcache.bbclass @@ -46,14 +46,16 @@ python populate_packages_append() { } # -# Add a sstate postinst hook to update the cache for native packages +# Add an sstate postinst hook to update the cache for native packages. +# An error exit during populate_sysroot_setscene allows bitbake to +# try to recover by re-building the package. # SSTATEPOSTINSTFUNCS_append_class-native = " pixbufcache_sstate_postinst" pixbufcache_sstate_postinst() { if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] then - GDK_PIXBUF_FATAL_LOADER=1 gdk-pixbuf-query-loaders --update-cache + GDK_PIXBUF_FATAL_LOADER=1 gdk-pixbuf-query-loaders --update-cache || exit 1 fi } |