diff options
author | Ross Burton <ross.burton@intel.com> | 2015-09-25 23:25:12 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-28 12:00:16 +0100 |
commit | 8a12632e975d0efe71346b56202d19fe3f83ff08 (patch) | |
tree | b00e5069620422f28dd563e53264c7b29bd0fafc /scripts/postinst-intercepts/update_icon_cache | |
parent | b0707780fb4eb3a11c00e8d112d44b750e6d522c (diff) | |
download | poky-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/postinst-intercepts/update_icon_cache')
-rw-r--r-- | scripts/postinst-intercepts/update_icon_cache | 3 |
1 files changed, 2 insertions, 1 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 | ||
3 | set -e | 3 | set -e |
4 | |||
4 | # update native pixbuf loaders | 5 | # update native pixbuf loaders |
5 | gdk-pixbuf-query-loaders --update-cache | 6 | ${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders --update-cache |
6 | 7 | ||
7 | for icondir in $D/usr/share/icons/*/ ; do | 8 | for icondir in $D/usr/share/icons/*/ ; do |
8 | if [ -d $icondir ] ; then | 9 | if [ -d $icondir ] ; then |