summaryrefslogtreecommitdiffstats
path: root/meta/recipes-sato
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:45 +0000
commite469b0afafbf9e2570bcd3d147e694b66dd03b7d (patch)
tree38a459a53c943562974da56f7b01a6c9b9020b5c /meta/recipes-sato
parentb5829577bc921225b931be2ade2990dba1787d49 (diff)
downloadpoky-e469b0afafbf9e2570bcd3d147e694b66dd03b7d.tar.gz
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 (From OE-Core rev: 5d38923f677c55941c7efc95d66e8ec0fd49d0ab) Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-sato')
-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 43c5d3ed6a..6cf188b2d0 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
13 CMD="matchbox-keyboard -d -o portrait" 13 CMD="matchbox-keyboard -d -o portrait"
14 fi 14 fi
15fi 15fi
16
17 16
18if [ "$CMD" ]; then 17if [ "$CMD" ]; then
19 # Delay to make sure the window manager is active 18 # Delay to make sure the window manager is active
20 # by waiting for the desktop to say its finished loading 19 # by waiting for the desktop to say its finished loading
21 dbus-wait org.matchbox_project.desktop Loaded 20 dbus-wait org.matchbox_project.desktop Loaded && $CMD &
22 exec $CMD
23fi 21fi
diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
index 00a75af60e..7a99a9c46a 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"
16 16
17SRC_URI = "git://git.yoctoproject.org/${BPN};branch=matchbox-keyboard-0-1 \ 17SRC_URI = "git://git.yoctoproject.org/${BPN};branch=matchbox-keyboard-0-1 \
18 file://single-instance.patch \ 18 file://single-instance.patch \
19 file://80matchboxkeyboard.shbg" 19 file://80matchboxkeyboard.sh"
20 20
21S = "${WORKDIR}/git" 21S = "${WORKDIR}/git"
22 22
@@ -41,7 +41,7 @@ FILES_${PN}-applet = "${libdir}/matchbox-panel/*.so"
41 41
42do_install_append () { 42do_install_append () {
43 install -d ${D}/${sysconfdir}/X11/Xsession.d/ 43 install -d ${D}/${sysconfdir}/X11/Xsession.d/
44 install -m 755 ${WORKDIR}/80matchboxkeyboard.shbg ${D}/${sysconfdir}/X11/Xsession.d/ 44 install -m 755 ${WORKDIR}/80matchboxkeyboard.sh ${D}/${sysconfdir}/X11/Xsession.d/
45 45
46 rm -f ${D}${libdir}/gtk-2.0/*/immodules/*.la 46 rm -f ${D}${libdir}/gtk-2.0/*/immodules/*.la
47 rm -f ${D}${libdir}/matchbox-panel/*.la 47 rm -f ${D}${libdir}/matchbox-panel/*.la