diff options
author | Yusuke Mitsuki <mickey.happygolucky@gmail.com> | 2017-08-08 09:59:13 +0900 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-13 13:20:59 +0200 |
commit | 087348874fdf82183c7609148bebec64be885c20 (patch) | |
tree | 591519e1e51b562704e93f0ad769cd095f8e51bc /meta-oe/recipes-support/uim | |
parent | 8c5e619658a0a2f8229d073da99ecd2721d3c671 (diff) | |
download | meta-openembedded-087348874fdf82183c7609148bebec64be885c20.tar.gz |
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>
Diffstat (limited to 'meta-oe/recipes-support/uim')
-rw-r--r-- | meta-oe/recipes-support/uim/uim_1.8.6.bb | 33 |
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 74ddc8a80..395bca252 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 | |||
21 | 21 | ||
22 | LEAD_SONAME = "libuim.so.1" | 22 | LEAD_SONAME = "libuim.so.1" |
23 | 23 | ||
24 | inherit autotools pkgconfig gettext | 24 | inherit autotools pkgconfig gettext qemu |
25 | 25 | ||
26 | EXTRA_OECONF += "--disable-emacs \ | 26 | EXTRA_OECONF += "--disable-emacs \ |
27 | --without-scim \ | 27 | --without-scim \ |
@@ -103,21 +103,20 @@ FILES_uim-skk = "${libdir}/uim/plugin/libuim-skk.* \ | |||
103 | ${datadir}/uim/skk*.scm \ | 103 | ${datadir}/uim/skk*.scm \ |
104 | " | 104 | " |
105 | 105 | ||
106 | PACKAGE_WRITE_DEPS += "qemu-native" | ||
106 | pkg_postinst_uim-anthy() { | 107 | pkg_postinst_uim-anthy() { |
107 | if [ -f /usr/bin/uim-module-manager ]; then | 108 | if test -n "$D"; then |
108 | /usr/bin/uim-module-manager --register anthy --path /etc/uim | 109 | ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --register anthy --path $D${datadir}/uim |
109 | fi | 110 | else |
110 | } | 111 | uim-module-manager --register anthy --path ${datadir}/uim |
111 | |||
112 | pkg_postrm_uim-anthy() { | ||
113 | if [ -f /usr/bin/uim-module-manager ]; then | ||
114 | /usr/bin/uim-module-manager --path /etc/uim --unregister anthy | ||
115 | fi | 112 | fi |
116 | } | 113 | } |
117 | 114 | ||
118 | pkg_prerm_uim-anthy() { | 115 | pkg_prerm_uim-anthy() { |
119 | if [ -f /usr/bin/uim-module-manager ]; then | 116 | if test -n "$D"; then |
120 | /usr/bin/uim-module-manager --register anthy --path /etc/uim | 117 | ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --path $D${datadir}/uim --unregister anthy |
118 | else | ||
119 | uim-module-manager --path ${datadir}/uim --unregister anthy | ||
121 | fi | 120 | fi |
122 | } | 121 | } |
123 | 122 | ||
@@ -126,14 +125,18 @@ pkg_postinst_uim-gtk2.0() { | |||
126 | } | 125 | } |
127 | 126 | ||
128 | pkg_postinst_uim-skk() { | 127 | pkg_postinst_uim-skk() { |
129 | if [ -f /usr/bin/uim-module-manager ]; then | 128 | if test -n "$D"; then |
130 | /usr/bin/uim-module-manager --register skk --path /etc/uim | 129 | ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --register skk --path $D${datadir}/uim |
130 | else | ||
131 | uim-module-manager --register skk --path ${datadir}/uim | ||
131 | fi | 132 | fi |
132 | } | 133 | } |
133 | 134 | ||
134 | pkg_postrm_uim-skk() { | 135 | pkg_postrm_uim-skk() { |
135 | if [ -f /usr/bin/uim-module-manager ]; then | 136 | if test -n "$D"; then |
136 | /usr/bin/uim-module-manager --path /etc/uim --unregister skk | 137 | ${@qemu_run_binary(d, '$D', '${bindir}/uim-module-manager')} --path $D${datadir}/uim --unregister skk |
138 | else | ||
139 | uim-module-manager --path ${datadir}/uim --unregister skk | ||
137 | fi | 140 | fi |
138 | } | 141 | } |
139 | 142 | ||