[oe-commits] Joe Slater : pixbufcache: add error exit in pixbufcache_sstate_postinst
git at git.openembedded.org
git at git.openembedded.org
Thu Apr 24 16:55:36 UTC 2014
Module: openembedded-core.git
Branch: master
Commit: 17bdb2538e6b723e11afb1079c71363603dba63d
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=17bdb2538e6b723e11afb1079c71363603dba63d
Author: Joe Slater <jslater at windriver.com>
Date: Tue Apr 22 11:00:41 2014 -0700
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 at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/pixbufcache.bbclass | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/meta/classes/pixbufcache.bbclass b/meta/classes/pixbufcache.bbclass
index 922174d..b8d75bd 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
}
More information about the Openembedded-commits
mailing list