aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Belloni <alexandre.belloni@free-electrons.com>2014-02-17 13:49:59 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-17 15:34:07 +0000
commit5d38923f677c55941c7efc95d66e8ec0fd49d0ab (patch)
tree45229a4312efe5ff83fdfb55e591626f25ad34b7
parent8491b998d290f9717d537ca84bc2beb475cf3ced (diff)
downloadopenembedded-core-5d38923f677c55941c7efc95d66e8ec0fd49d0ab.zip
openembedded-core-5d38923f677c55941c7efc95d66e8ec0fd49d0ab.tar.gz
openembedded-core-5d38923f677c55941c7efc95d66e8ec0fd49d0ab.tar.bz2
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>
-rw-r--r--[-rwxr-xr-x]meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh (renamed from meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.shbg)4
-rw-r--r--meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb4
2 files changed, 3 insertions, 5 deletions
diff --git a/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.shbg b/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh
index 43c5d3e..6cf188b 100755..100644
--- 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 00a75af..7a99a9c 100644
--- 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