Acked-By: Ross Burton <[email protected]>
On 22 April 2014 19:00, Joe Slater <[email protected]> wrote: > 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 <[email protected]> > --- > 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 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 > } > > -- > 1.7.3.4 > > -- > _______________________________________________ > Openembedded-core mailing list > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
