diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2018-06-11 16:38:20 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-06-18 11:07:58 +0100 |
commit | 87631af64032b18ea354b27cc586ec13391bd143 (patch) | |
tree | 18747d896b9853e44fb7039921adc66c0ee3518e /scripts/postinst-intercepts/update_pixbuf_cache | |
parent | e67551e80e100913f59f3f9c8071ca451be02289 (diff) | |
download | poky-87631af64032b18ea354b27cc586ec13391bd143.tar.gz |
qemuwrapper-cross: enable multilib and nativesdk variants of the script
Previously only one global variant of the script was created,
which caused numerous issues:
1) multilib was not properly supported due to multilib variants each
needing their own version of the qemu binary and library paths to be set
2) nativesdk was not properly supported for the same reason
This patch also moves setting LD_LIBRARY_PATH directly into the
recipe, as passing it down from other recipes did not work when
said recipes were allarch, and adjusts calls to qemuwrapper from
postinst-intercepts, so that its correct variant is selected.
Also, the various qemu fallbacks in qemuwrapper script are all removed,
as they are no longer necessary.
(From OE-Core rev: d10fd6ae3fe46290c6e3a5250878966d9f12ca3f)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/postinst-intercepts/update_pixbuf_cache')
-rw-r--r-- | scripts/postinst-intercepts/update_pixbuf_cache | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/postinst-intercepts/update_pixbuf_cache b/scripts/postinst-intercepts/update_pixbuf_cache index 5d44075fb4..ebea07c356 100644 --- a/scripts/postinst-intercepts/update_pixbuf_cache +++ b/scripts/postinst-intercepts/update_pixbuf_cache | |||
@@ -5,7 +5,6 @@ set -e | |||
5 | export GDK_PIXBUF_MODULEDIR=$D${libdir}/gdk-pixbuf-2.0/2.10.0/loaders | 5 | export GDK_PIXBUF_MODULEDIR=$D${libdir}/gdk-pixbuf-2.0/2.10.0/loaders |
6 | export GDK_PIXBUF_FATAL_LOADER=1 | 6 | export GDK_PIXBUF_FATAL_LOADER=1 |
7 | 7 | ||
8 | PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\ | 8 | PSEUDO_UNLOAD=1 ${binprefix}qemuwrapper -L $D $D${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \ |
9 | $D${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \ | ||
10 | >$GDK_PIXBUF_MODULEDIR/../loaders.cache && \ | 9 | >$GDK_PIXBUF_MODULEDIR/../loaders.cache && \ |
11 | sed -i -e "s:$D::g" $GDK_PIXBUF_MODULEDIR/../loaders.cache | 10 | sed -i -e "s:$D::g" $GDK_PIXBUF_MODULEDIR/../loaders.cache |