diff options
author | Joe Slater <jslater@windriver.com> | 2014-04-22 11:00:41 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-29 13:42:18 +0100 |
commit | 5709daae3625cf51d10c179ae5138479d85bd6c0 (patch) | |
tree | 06fdde58be3e36aed9e7a34ce9915b6737ec0423 /meta/classes/pixbufcache.bbclass | |
parent | f0a153a7f635ddd63ce1eb1b557bc3589d47fd21 (diff) | |
download | poky-5709daae3625cf51d10c179ae5138479d85bd6c0.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)
(From OE-Core rev: 90492efeacc7645592bbd5c4518f519f732e5f95)
Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/pixbufcache.bbclass')
-rw-r--r-- | meta/classes/pixbufcache.bbclass | 6 |
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 | # |
51 | SSTATEPOSTINSTFUNCS_append_class-native = " pixbufcache_sstate_postinst" | 53 | SSTATEPOSTINSTFUNCS_append_class-native = " pixbufcache_sstate_postinst" |
52 | 54 | ||
53 | pixbufcache_sstate_postinst() { | 55 | pixbufcache_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 | ||