sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Joe Slater 2014-04-22 11:00:41 -07:00 committed by Richard Purdie
parent 69b6eaca3d
commit 2a129dd370
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta/classes/pixbufcache.bbclass
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
}