From 5709daae3625cf51d10c179ae5138479d85bd6c0 Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Tue, 22 Apr 2014 11:00:41 -0700 Subject: 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) (From OE-Core rev: 90492efeacc7645592bbd5c4518f519f732e5f95) Signed-off-by: Joe Slater Signed-off-by: Richard Purdie --- meta/classes/pixbufcache.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'meta/classes') 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 } -- cgit v1.2.3-54-g00ecf