Patchwork [v2,2/3] gtk-immodules-cache.bbclass: allow for offline cache generation

login
register
mail settings
Submitter Laurentiu Palcu
Date Dec. 20, 2012, 1:15 p.m.
Message ID <1356009340-15874-3-git-send-email-laurentiu.palcu@intel.com>
Download mbox | patch
Permalink /patch/41397/
State Accepted
Commit 9129102aee5ad264a978dbefb4b40943d4b1e068
Headers show

Comments

Laurentiu Palcu - Dec. 20, 2012, 1:15 p.m.
In order to support a RO rootfs, the cache generation during postinstall
has to be done on host. However, gtk-query-immodules application will
only be able to parse shared objects from the same ELF class.
In order not to have a native package for all the recipes providing
an input method, so we can generate the cache file natively, run
gtk-query-immodules through qemu emulator.

[YOCTO #3602]

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
 meta/classes/gtk-immodules-cache.bbclass |   17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)
Ross Burton - Dec. 20, 2012, 2:45 p.m.
On 20 December 2012 13:15, Laurentiu Palcu <laurentiu.palcu@intel.com> wrote:
> In order to support a RO rootfs, the cache generation during postinstall
> has to be done on host. However, gtk-query-immodules application will
> only be able to parse shared objects from the same ELF class.
> In order not to have a native package for all the recipes providing
> an input method, so we can generate the cache file natively, run
> gtk-query-immodules through qemu emulator.

Signed-off-by: Ross Burton <ross.burton@intel.com>

Ross

Patch

diff --git a/meta/classes/gtk-immodules-cache.bbclass b/meta/classes/gtk-immodules-cache.bbclass
index 515d28b..9ffb03b 100644
--- a/meta/classes/gtk-immodules-cache.bbclass
+++ b/meta/classes/gtk-immodules-cache.bbclass
@@ -2,9 +2,24 @@ 
 #
 # Usage: Set GTKIMMODULES_PACKAGES to the packages that needs to update the inputmethod modules
 
+DEPENDS =+ "qemu-native"
+
+inherit qemu
+
 gtk_immodule_cache_postinst() {
 if [ "x$D" != "x" ]; then
-    exit 1
+    for maj_ver in 2 3; do
+        if [ -x $D${bindir}/gtk-query-immodules-$maj_ver.0 ]; then
+            IMFILES=$(ls $D${libdir}/gtk-$maj_ver.0/*/immodules/*.so)
+            ${@qemu_run_binary(d, '$D', '${bindir}/gtk-query-immodules-$maj_ver.0')} \
+                $IMFILES > $D/etc/gtk-$maj_ver.0/gtk.immodules 2>/dev/null &&
+                sed -i -e "s:$D::" $D/etc/gtk-$maj_ver.0/gtk.immodules
+
+            [ $? -ne 0 ] && exit 1
+        fi
+    done
+
+    exit 0
 fi
 if [ ! -z `which gtk-query-immodules-2.0` ]; then
     gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules