[oe-commits] [meta-openembedded] 04/05: uim: Fixed pkg_postinst_*/pkg_prerm_* for uim-anthy and uim-skk.
git at git.openembedded.org
git at git.openembedded.org
Tue Aug 8 18:58:10 UTC 2017
This is an automated email from the git hooks/post-receive script.
martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.
commit eedc727afad7cd04d3f49029bd8b806f19a8f33e
Author: Yusuke Mitsuki <mickey.happygolucky at gmail.com>
AuthorDate: Tue Aug 8 09:59:13 2017 +0900
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 at gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
meta-oe/recipes-support/uim/uim_1.8.6.bb | 33 +++++++++++++++++---------------
1 file 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 e5666e6..f39593c 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
}
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list