summaryrefslogtreecommitdiffstats
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:55:13 +0100
commit2a129dd370fafd6733ff136e0c7c801ea451091b (patch)
treeed0ecbbf270ddbe132f8f8a319f5b08a1a8eb388
parent69b6eaca3d9b635e8a61a0fdbd814b558e91901d (diff)
downloadpoky-2a129dd370fafd6733ff136e0c7c801ea451091b.tar.gz
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>
-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() {
46} 46}
47 47
48# 48#
49# Add a sstate postinst hook to update the cache for native packages 49# Add an sstate postinst hook to update the cache for native packages.
50# An error exit during populate_sysroot_setscene allows bitbake to
51# try to recover by re-building the package.
50# 52#
51SSTATEPOSTINSTFUNCS_append_class-native = " pixbufcache_sstate_postinst" 53SSTATEPOSTINSTFUNCS_append_class-native = " pixbufcache_sstate_postinst"
52 54
53pixbufcache_sstate_postinst() { 55pixbufcache_sstate_postinst() {
54 if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] 56 if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]
55 then 57 then
56 GDK_PIXBUF_FATAL_LOADER=1 gdk-pixbuf-query-loaders --update-cache 58 GDK_PIXBUF_FATAL_LOADER=1 gdk-pixbuf-query-loaders --update-cache || exit 1
57 fi 59 fi
58} 60}
59 61