summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2018-09-11 23:25:20 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-13 06:42:28 (GMT)
commitee929034ebd712c702bb1199dec59999d91c15f0 (patch)
tree333d0a8ced47881c115c0e418176fe34a6235c5c /scripts
parent44fa30ffa23c9816f4eade57b4002f0c9fa89735 (diff)
downloadpoky-ee929034ebd712c702bb1199dec59999d91c15f0.tar.gz
update_gtk_immodules_cache: update for multilib
Postinstall script update_gtk_immodules_cache calls ${bindir}/gtk-query-immodules-${version}. When multilib is enabled, both packages foo and lib32-foo call ${bindir}/gtk-query-immodules-${version} and one of them will fail to run obviously. Duplicate install files gtk-query-immodules-${version} to ${libexecdir} with ${MLPREFIX}. And update update_gtk_immodules_cache calls proper binary. (From OE-Core rev: cad28bd74438d8edbdb02a2d56169e2a55260ca8) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/postinst-intercepts/update_gtk_immodules_cache8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/postinst-intercepts/update_gtk_immodules_cache b/scripts/postinst-intercepts/update_gtk_immodules_cache
index d85d362..3955169 100644
--- a/scripts/postinst-intercepts/update_gtk_immodules_cache
+++ b/scripts/postinst-intercepts/update_gtk_immodules_cache
@@ -2,14 +2,14 @@
2 2
3set -e 3set -e
4 4
5if [ -x $D${bindir}/gtk-query-immodules-2.0 ]; then 5if [ -x $D${libexecdir}/${binprefix}gtk-query-immodules-2.0 ]; then
6 PSEUDO_UNLOAD=1 ${binprefix}qemuwrapper -L $D $D/${bindir}/gtk-query-immodules-2.0 \ 6 PSEUDO_UNLOAD=1 ${binprefix}qemuwrapper -L $D $D${libexecdir}/${binprefix}gtk-query-immodules-2.0 \
7 > $D${libdir}/gtk-2.0/2.10.0/immodules.cache && 7 > $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 8 sed -i -e "s:$D::" $D${libdir}/gtk-2.0/2.10.0/immodules.cache
9 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
10fi 10fi
11if [ -x $D${bindir}/gtk-query-immodules-3.0 ]; then 11if [ -x $D${libexecdir}/${binprefix}gtk-query-immodules-3.0 ]; then
12 PSEUDO_UNLOAD=1 ${binprefix}qemuwrapper -L $D $D/${bindir}/gtk-query-immodules-3.0 \ 12 PSEUDO_UNLOAD=1 ${binprefix}qemuwrapper -L $D $D${libexecdir}/${binprefix}gtk-query-immodules-3.0 \
13 > $D${libdir}/gtk-3.0/3.0.0/immodules.cache && 13 > $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 14 sed -i -e "s:$D::" $D${libdir}/gtk-3.0/3.0.0/immodules.cache
15 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