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 <jslater@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Joe Slater
2014-04-22 11:00:41 -07:00
committed by Richard Purdie
parent f0a153a7f6
commit 5709daae36

View File

@@ -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
}