summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Slater <jslater@windriver.com>2014-04-22 11:00:41 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-24 17:54:55 +0100
commit17bdb2538e6b723e11afb1079c71363603dba63d (patch)
tree68903f09f6a0f661489c9fd55466166028dc81eb
parentbaf5b230af919b6b0fd14ac5fc3e734bf7c464d5 (diff)
downloadopenembedded-core-17bdb2538e6b723e11afb1079c71363603dba63d.tar.gz
openembedded-core-17bdb2538e6b723e11afb1079c71363603dba63d.tar.bz2
openembedded-core-17bdb2538e6b723e11afb1079c71363603dba63d.zip
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. Signed-off-by: Joe Slater <jslater@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/pixbufcache.bbclass6
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
}