matchbox-keyboard: daemonize launch

The .shbg extension is not properly supported by the Xsession script
provided by xserver-common.

See discussion here:
https://lists.yoctoproject.org/pipermail/poky/2013-December/009463.html

Bug here:
https://bugzilla.yoctoproject.org/show_bug.cgi?id=5546

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.shbg b/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh
old mode 100755 (executable)
new mode 100644 (file)
similarity index 89%
rename from meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.shbg
rename to meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh
index 43c5d3e..6cf188b
--- a/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.shbg
+++ b/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh
@@ -13,11 +13,9 @@ elif [ "$DISPLAY_CAN_ROTATE" = "1" ]; then
         CMD="matchbox-keyboard -d -o portrait"
     fi
 fi
-                                       
 
 if [ "$CMD" ]; then
     # Delay to make sure the window manager is active
     # by waiting for the desktop to say its finished loading
-    dbus-wait org.matchbox_project.desktop Loaded
-    exec $CMD
+    dbus-wait org.matchbox_project.desktop Loaded && $CMD &
 fi

diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
index 00a75af60eb0c623efc8a9b5a901255ad97fa7ff..7a99a9c46a7e6cf9de254d33d35b69d8f54f889e 100644 (file)
--- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
+++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
@@ -16,7 +16,7 @@ PR = "r4"
 
 SRC_URI = "git://git.yoctoproject.org/${BPN};branch=matchbox-keyboard-0-1 \
            file://single-instance.patch \
-           file://80matchboxkeyboard.shbg"
+           file://80matchboxkeyboard.sh"
 
 S = "${WORKDIR}/git"
 
@@ -41,7 +41,7 @@ FILES_${PN}-applet = "${libdir}/matchbox-panel/*.so"
 
 do_install_append () {
        install -d ${D}/${sysconfdir}/X11/Xsession.d/
-       install -m 755 ${WORKDIR}/80matchboxkeyboard.shbg ${D}/${sysconfdir}/X11/Xsession.d/
+       install -m 755 ${WORKDIR}/80matchboxkeyboard.sh ${D}/${sysconfdir}/X11/Xsession.d/
 
        rm -f ${D}${libdir}/gtk-2.0/*/immodules/*.la
        rm -f ${D}${libdir}/matchbox-panel/*.la