summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-09-25 23:25:12 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-28 12:00:16 +0100
commit8a12632e975d0efe71346b56202d19fe3f83ff08 (patch)
treeb00e5069620422f28dd563e53264c7b29bd0fafc /scripts
parentb0707780fb4eb3a11c00e8d112d44b750e6d522c (diff)
downloadpoky-8a12632e975d0efe71346b56202d19fe3f83ff08.tar.gz
gdk-pixbuf: move gdk-pixbuf-query-loaders to $libdir for multilib safety
If for example gdk-pixbuf and lib32-gdk-pixbuf are in an image then only one ${bindir}/gdk-pixbuf-query-loaders will be installed, so only one variant will actually be usable. Solve this by moving gdk-pixbuf-query-loaders into ${libdir} as it's intimately tied to the library and rarely directly invoked by the user, and update the callers to use the right path. (From OE-Core rev: 69df75f268e2b3d5874f05e2b5a6125f6d990a03) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/postinst-intercepts/update_icon_cache3
-rw-r--r--scripts/postinst-intercepts/update_pixbuf_cache4
2 files changed, 3 insertions, 4 deletions
diff --git a/scripts/postinst-intercepts/update_icon_cache b/scripts/postinst-intercepts/update_icon_cache
index 8e17a6ac0c..c02273d52a 100644
--- a/scripts/postinst-intercepts/update_icon_cache
+++ b/scripts/postinst-intercepts/update_icon_cache
@@ -1,8 +1,9 @@
1#!/bin/sh 1#!/bin/sh
2 2
3set -e 3set -e
4
4# update native pixbuf loaders 5# update native pixbuf loaders
5gdk-pixbuf-query-loaders --update-cache 6${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache
6 7
7for icondir in $D/usr/share/icons/*/ ; do 8for icondir in $D/usr/share/icons/*/ ; do
8 if [ -d $icondir ] ; then 9 if [ -d $icondir ] ; then
diff --git a/scripts/postinst-intercepts/update_pixbuf_cache b/scripts/postinst-intercepts/update_pixbuf_cache
index 95bf4f90a3..a8b4001069 100644
--- a/scripts/postinst-intercepts/update_pixbuf_cache
+++ b/scripts/postinst-intercepts/update_pixbuf_cache
@@ -4,8 +4,6 @@ export GDK_PIXBUF_MODULEDIR=$D${libdir}/gdk-pixbuf-2.0/2.10.0/loaders
4export GDK_PIXBUF_FATAL_LOADER=1 4export GDK_PIXBUF_FATAL_LOADER=1
5 5
6PSEUDO_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}\
7 $D${bindir}/gdk-pixbuf-query-loaders \ 7 $D${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \
8 >$GDK_PIXBUF_MODULEDIR/../loaders.cache && \ 8 >$GDK_PIXBUF_MODULEDIR/../loaders.cache && \
9 sed -i -e "s:$D::g" $GDK_PIXBUF_MODULEDIR/../loaders.cache 9 sed -i -e "s:$D::g" $GDK_PIXBUF_MODULEDIR/../loaders.cache
10
11