summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2014-04-01 17:23:37 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-01 23:39:14 +0100
commit1eae7d2503cb1d50baf3554361e5c8287a0a6ed9 (patch)
treec8b91e32d147b484e952f65d245d8baa1ecc4133
parent41f2f8ee89c372a09c0a207e1552adbd77e27e01 (diff)
downloadpoky-1eae7d2503cb1d50baf3554361e5c8287a0a6ed9.tar.gz
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. (From OE-Core rev: 0a97b1571821848af11d8651c7145ed9592f9e31) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/pixbufcache.bbclass2
-rw-r--r--scripts/postinst-intercepts/update_pixbuf_cache1
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"
53pixbufcache_sstate_postinst() { 53pixbufcache_sstate_postinst() {
54 if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] 54 if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]
55 then 55 then
56 gdk-pixbuf-query-loaders --update-cache 56 GDK_PIXBUF_FATAL_LOADER=1 gdk-pixbuf-query-loaders --update-cache
57 fi 57 fi
58} 58}
59 59
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 @@
1#!/bin/sh 1#!/bin/sh
2 2
3export GDK_PIXBUF_MODULEDIR=$D${libdir}/gdk-pixbuf-2.0/2.10.0/loaders 3export GDK_PIXBUF_MODULEDIR=$D${libdir}/gdk-pixbuf-2.0/2.10.0/loaders
4export GDK_PIXBUF_FATAL_LOADER=1
4 5
5PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\ 6PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\
6 $D${bindir}/gdk-pixbuf-query-loaders \ 7 $D${bindir}/gdk-pixbuf-query-loaders \