summaryrefslogtreecommitdiffstats
path: root/scripts/postinst-intercepts
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-06-11 16:38:20 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-18 11:07:58 +0100
commit87631af64032b18ea354b27cc586ec13391bd143 (patch)
tree18747d896b9853e44fb7039921adc66c0ee3518e /scripts/postinst-intercepts
parente67551e80e100913f59f3f9c8071ca451be02289 (diff)
downloadpoky-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')
-rw-r--r--scripts/postinst-intercepts/update_font_cache3
-rw-r--r--scripts/postinst-intercepts/update_gio_module_cache3
-rw-r--r--scripts/postinst-intercepts/update_gtk_immodules_cache6
-rw-r--r--scripts/postinst-intercepts/update_pixbuf_cache3
4 files changed, 5 insertions, 10 deletions
diff --git a/scripts/postinst-intercepts/update_font_cache b/scripts/postinst-intercepts/update_font_cache
index bf65e19a41..20e9048adf 100644
--- a/scripts/postinst-intercepts/update_font_cache
+++ b/scripts/postinst-intercepts/update_font_cache
@@ -2,6 +2,5 @@
2 2
3set -e 3set -e
4 4
5PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir} \ 5PSEUDO_UNLOAD=1 ${binprefix}qemuwrapper -L $D -E ${fontconfigcacheenv} $D${bindir}/fc-cache --sysroot=$D --system-only ${fontconfigcacheparams}
6 -E ${fontconfigcacheenv} $D${bindir}/fc-cache --sysroot=$D --system-only ${fontconfigcacheparams}
7chown -R root:root $D${fontconfigcachedir} 6chown -R root:root $D${fontconfigcachedir}
diff --git a/scripts/postinst-intercepts/update_gio_module_cache b/scripts/postinst-intercepts/update_gio_module_cache
index fc3f9d0d6c..d1f0140947 100644
--- a/scripts/postinst-intercepts/update_gio_module_cache
+++ b/scripts/postinst-intercepts/update_gio_module_cache
@@ -2,8 +2,7 @@
2 2
3set -e 3set -e
4 4
5PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D${libdir}:$D${base_libdir} \ 5PSEUDO_UNLOAD=1 ${binprefix}qemuwrapper -L $D $D${libexecdir}/${binprefix}gio-querymodules $D${libdir}/gio/modules/
6 $D${libexecdir}/${binprefix}gio-querymodules $D${libdir}/gio/modules/
7 6
8[ ! -e $D${libdir}/gio/modules/giomodule.cache ] || 7[ ! -e $D${libdir}/gio/modules/giomodule.cache ] ||
9 chown root:root $D${libdir}/gio/modules/giomodule.cache 8 chown root:root $D${libdir}/gio/modules/giomodule.cache
diff --git a/scripts/postinst-intercepts/update_gtk_immodules_cache b/scripts/postinst-intercepts/update_gtk_immodules_cache
index e2b9ff7438..d85d3622c2 100644
--- a/scripts/postinst-intercepts/update_gtk_immodules_cache
+++ b/scripts/postinst-intercepts/update_gtk_immodules_cache
@@ -3,15 +3,13 @@
3set -e 3set -e
4 4
5if [ -x $D${bindir}/gtk-query-immodules-2.0 ]; then 5if [ -x $D${bindir}/gtk-query-immodules-2.0 ]; then
6 PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D${libdir}:$D${base_libdir} \ 6 PSEUDO_UNLOAD=1 ${binprefix}qemuwrapper -L $D $D/${bindir}/gtk-query-immodules-2.0 \
7 $D/${bindir}/gtk-query-immodules-2.0 \
8 > $D${libdir}/gtk-2.0/2.10.0/immodules.cache && 7 > $D${libdir}/gtk-2.0/2.10.0/immodules.cache &&
9 sed -i -e "s:$D::" $D${libdir}/gtk-2.0/2.10.0/immodules.cache 8 sed -i -e "s:$D::" $D${libdir}/gtk-2.0/2.10.0/immodules.cache
10 chown root:root $D${libdir}/gtk-2.0/2.10.0/immodules.cache 9 chown root:root $D${libdir}/gtk-2.0/2.10.0/immodules.cache
11fi 10fi
12if [ -x $D${bindir}/gtk-query-immodules-3.0 ]; then 11if [ -x $D${bindir}/gtk-query-immodules-3.0 ]; then
13 PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D${libdir}:$D${base_libdir} \ 12 PSEUDO_UNLOAD=1 ${binprefix}qemuwrapper -L $D $D/${bindir}/gtk-query-immodules-3.0 \
14 $D/${bindir}/gtk-query-immodules-3.0 \
15 > $D${libdir}/gtk-3.0/3.0.0/immodules.cache && 13 > $D${libdir}/gtk-3.0/3.0.0/immodules.cache &&
16 sed -i -e "s:$D::" $D${libdir}/gtk-3.0/3.0.0/immodules.cache 14 sed -i -e "s:$D::" $D${libdir}/gtk-3.0/3.0.0/immodules.cache
17 chown root:root $D${libdir}/gtk-3.0/3.0.0/immodules.cache 15 chown root:root $D${libdir}/gtk-3.0/3.0.0/immodules.cache
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
5export GDK_PIXBUF_MODULEDIR=$D${libdir}/gdk-pixbuf-2.0/2.10.0/loaders 5export GDK_PIXBUF_MODULEDIR=$D${libdir}/gdk-pixbuf-2.0/2.10.0/loaders
6export GDK_PIXBUF_FATAL_LOADER=1 6export GDK_PIXBUF_FATAL_LOADER=1
7 7
8PSEUDO_UNLOAD=1 qemuwrapper -L $D -E LD_LIBRARY_PATH=$D/${libdir}:$D/${base_libdir}\ 8PSEUDO_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