aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYusuke Mitsuki <mickey.happygolucky@gmail.com>2017-08-08 09:59:13 +0900
committerMartin Jansa <Martin.Jansa@gmail.com>2017-08-13 13:20:59 +0200
commit087348874fdf82183c7609148bebec64be885c20 (patch)
tree591519e1e51b562704e93f0ad769cd095f8e51bc
parent8c5e619658a0a2f8229d073da99ecd2721d3c671 (diff)
downloadmeta-openembedded-contrib-087348874fdf82183c7609148bebec64be885c20.tar.gz
meta-openembedded-contrib-087348874fdf82183c7609148bebec64be885c20.tar.bz2
meta-openembedded-contrib-087348874fdf82183c7609148bebec64be885c20.zip
uim: Fixed pkg_postinst_*/pkg_prerm_* for uim-anthy and uim-skk.
pkg_postinst*/pkg_prerm_* functions are not worked correctly. Because uim-module-manager executes on the host machine. It needs executed via qemu. Signed-off-by: Yusuke Mitsuki <mickey.happygolucky@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-oe/recipes-support/uim/uim_1.8.6.bb33
1 files changed, 18 insertions, 15 deletions
diff --git a/meta-oe/recipes-support/uim/uim_1.8.6.bb b/meta-oe/recipes-support/uim/uim_1.8.6.bb
index 74ddc8a804..395bca2522 100644
--- a/meta-oe/recipes-support/uim/uim_1.8.6.bb
+++ b/meta-oe/recipes-support/uim/uim_1.8.6.bb
@@ -21,7 +21,7 @@ RDEPENDS_uim-anthy = "takao-fonts anthy libanthy0 glibc-utils glibc-gconv-euc-jp
LEAD_SONAME = "libuim.so.1"
-inherit autotools pkgconfig gettext
+inherit autotools pkgconfig gettext qemu
EXTRA_OECONF += "--disable-emacs \
--without-scim \
@@ -103,21 +103,20 @@ FILES_uim-skk = "${libdir}/uim/plugin/libuim-skk.* \
${datadir}/uim/skk*.scm \
"
+PACKAGE_WRITE_DEPS += "qemu-native"
pkg_postinst_uim-anthy() {
- if [ -f /usr/bin/uim-module-manager ]; then
- /usr/bin/uim-module-manager --register anthy --path /etc/uim
- fi
-}
-
-pkg_postrm_uim-anthy() {
- if [ -f /usr/bin/uim-module-manager ]; then
- /usr/bin/uim-module-manager --path /etc/uim --unregister anthy
+ if test -n "$D"; then
+ ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --register anthy --path $D${datadir}/uim
+ else
+ uim-module-manager --register anthy --path ${datadir}/uim
fi
}
pkg_prerm_uim-anthy() {
- if [ -f /usr/bin/uim-module-manager ]; then
- /usr/bin/uim-module-manager --register anthy --path /etc/uim
+ if test -n "$D"; then
+ ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --path $D${datadir}/uim --unregister anthy
+ else
+ uim-module-manager --path ${datadir}/uim --unregister anthy
fi
}
@@ -126,14 +125,18 @@ pkg_postinst_uim-gtk2.0() {
}
pkg_postinst_uim-skk() {
- if [ -f /usr/bin/uim-module-manager ]; then
- /usr/bin/uim-module-manager --register skk --path /etc/uim
+ if test -n "$D"; then
+ ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --register skk --path $D${datadir}/uim
+ else
+ uim-module-manager --register skk --path ${datadir}/uim
fi
}
pkg_postrm_uim-skk() {
- if [ -f /usr/bin/uim-module-manager ]; then
- /usr/bin/uim-module-manager --path /etc/uim --unregister skk
+ if test -n "$D"; then
+ ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --path $D${datadir}/uim --unregister skk
+ else
+ uim-module-manager --path ${datadir}/uim --unregister skk
fi
}