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>
This commit is contained in:
Alexandre Belloni 2014-02-17 13:49:59 +01:00 committed by Richard Purdie
parent b5829577bc
commit e469b0afaf
2 changed files with 3 additions and 5 deletions

View File

@ -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

View File

@ -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