From 5d38923f677c55941c7efc95d66e8ec0fd49d0ab Mon Sep 17 00:00:00 2001 From: Alexandre Belloni Date: Mon, 17 Feb 2014 13:49:59 +0100 Subject: 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 Signed-off-by: Richard Purdie --- .../matchbox-keyboard/files/80matchboxkeyboard.sh | 21 ++++++++++++++++++++ .../files/80matchboxkeyboard.shbg | 23 ---------------------- 2 files changed, 21 insertions(+), 23 deletions(-) create mode 100644 meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh delete mode 100755 meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.shbg (limited to 'meta/recipes-sato/matchbox-keyboard/files') diff --git a/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh b/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh new file mode 100644 index 0000000000..6cf188b2d0 --- /dev/null +++ b/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh @@ -0,0 +1,21 @@ +#!/bin/sh + +. /etc/formfactor/config + +CMD="" + +if [ "$HAVE_KEYBOARD" = "0" ]; then + CMD="matchbox-keyboard -d" +elif [ "$DISPLAY_CAN_ROTATE" = "1" ]; then + if [ "$HAVE_KEYBOARD_PORTRAIT" = "1" -a "$HAVE_KEYBOARD_LANDSCAPE" = "0" ]; then + CMD="matchbox-keyboard -d -o landscape" + elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; 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 && $CMD & +fi diff --git a/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.shbg b/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.shbg deleted file mode 100755 index 43c5d3ed6a..0000000000 --- a/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.shbg +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -. /etc/formfactor/config - -CMD="" - -if [ "$HAVE_KEYBOARD" = "0" ]; then - CMD="matchbox-keyboard -d" -elif [ "$DISPLAY_CAN_ROTATE" = "1" ]; then - if [ "$HAVE_KEYBOARD_PORTRAIT" = "1" -a "$HAVE_KEYBOARD_LANDSCAPE" = "0" ]; then - CMD="matchbox-keyboard -d -o landscape" - elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; 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 -fi -- cgit v1.2.3