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

login
mail settings
Submitter Laurentiu Palcu
Date Dec. 19, 2012, 4:02 p.m.
Message ID <1355932969-25071-2-git-send-email-laurentiu.palcu@intel.com>
Download mbox | patch
Permalink /patch/41337/
State New
Headers show

Comments

Laurentiu Palcu - Dec. 19, 2012, 4:02 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.

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
 meta/classes/gtk-immodules-cache.bbclass |   22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)
Phil Blundell - Dec. 19, 2012, 4:06 p.m.
On Wed, 2012-12-19 at 18:02 +0200, Laurentiu Palcu wrote:
> +EMULATOR=qemu-$(echo ${TARGET_ARCH}| \
> +    sed -e 's/i[3-6]86/i386/' -e 's/x86[_-]64/x86_64/' \
> +        -e 's/powerpc/ppc/')

Maybe you could use ${@qemu_target_binary()} for that.

p.
Ross Burton - Dec. 19, 2012, 5:40 p.m.
On 19 December 2012 16:02, Laurentiu Palcu <laurentiu.palcu@intel.com> wrote:
> +        DYNAMIC_LOADER=$D$(readelf -a $D${bindir}/gtk-query-immodules-$maj_ver.0 |\

"readelf -l" means less output which is always good.

I'd like to see some of that logic separated out into a bbclass so it
can be easily re-used.

Ross

Patch

diff --git a/meta/classes/gtk-immodules-cache.bbclass b/meta/classes/gtk-immodules-cache.bbclass
index 515d28b..d57dcae 100644
--- a/meta/classes/gtk-immodules-cache.bbclass
+++ b/meta/classes/gtk-immodules-cache.bbclass
@@ -2,9 +2,29 @@ 
 #
 # Usage: Set GTKIMMODULES_PACKAGES to the packages that needs to update the inputmethod modules
 
+DEPENDS =+ "qemu-native"
+
 gtk_immodule_cache_postinst() {
 if [ "x$D" != "x" ]; then
-    exit 1
+EMULATOR=qemu-$(echo ${TARGET_ARCH}| \
+    sed -e 's/i[3-6]86/i386/' -e 's/x86[_-]64/x86_64/' \
+        -e 's/powerpc/ppc/')
+
+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)
+        DYNAMIC_LOADER=$D$(readelf -a $D${bindir}/gtk-query-immodules-$maj_ver.0 |\
+            grep "Requesting program interpreter"|sed -e 's/^.*\[.*: \(.*\)\]/\1/')
+        LIBRARY_PATH=$D${base_libdir}:$D${libdir}
+        $EMULATOR $DYNAMIC_LOADER --library-path $LIBRARY_PATH \
+            $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