diff options
| author | Ross Burton <ross.burton@intel.com> | 2014-04-01 17:23:37 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-01 23:38:15 +0100 |
| commit | 0a97b1571821848af11d8651c7145ed9592f9e31 (patch) | |
| tree | 767da1bbc23696220e7c6c9332245ca825aba672 | |
| parent | 8995c2cbb7a08c569d3e554b65f2bc3cc1682e2a (diff) | |
| download | openembedded-core-0a97b1571821848af11d8651c7145ed9592f9e31.tar.gz openembedded-core-0a97b1571821848af11d8651c7145ed9592f9e31.tar.bz2 openembedded-core-0a97b1571821848af11d8651c7145ed9592f9e31.zip | |
gdk-pixbuf: pass GDK_PIXBUF_FATAL_LOADER where relevant
Pass GDK_PIXBUF_FATAL_LOADER to the sstate postinst and intercept so that any
problems are flagged as errors instead of being silently ignored.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/pixbufcache.bbclass | 2 | ||||
| -rw-r--r-- | scripts/postinst-intercepts/update_pixbuf_cache | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/pixbufcache.bbclass b/meta/classes/pixbufcache.bbclass index 414fd30e6a..922174dffe 100644 --- a/meta/classes/pixbufcache.bbclass +++ b/meta/classes/pixbufcache.bbclass @@ -53,7 +53,7 @@ SSTATEPOSTINSTFUNCS_append_class-native = " pixbufcache_sstate_postinst" pixbufcache_sstate_postinst() { if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] then - gdk-pixbuf-query-loaders --update-cache + GDK_PIXBUF_FATAL_LOADER=1 gdk-pixbuf-query-loaders --update-cache fi } diff --git a/scripts/postinst-intercepts/update_pixbuf_cache b/scripts/postinst-intercepts/update_pixbuf_cache index 3f937738a1..95bf4f90a3 100644 --- a/scripts/postinst-intercepts/update_pixbuf_cache +++ b/scripts/postinst-intercepts/update_pixbuf_cache @@ -1,6 +1,7 @@ #!/bin/sh export GDK_PIXBUF_MODULEDIR=$D${libdir}/gdk-pixbuf-2.0/2.10.0/loaders +export GDK_PIXBUF_FATAL_LOADER=1 PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\ $D${bindir}/gdk-pixbuf-query-loaders \ |