* [PATCH] matchbox-keyboard: daemonize launch
@ 2014-01-17 10:09 Alexandre Belloni
2014-01-29 13:06 ` Alexandre Belloni
0 siblings, 1 reply; 2+ messages in thread
From: Alexandre Belloni @ 2014-01-17 10:09 UTC (permalink / raw)
To: Robert Yang; +Cc: openembedded-core
The .shbg extension is not properly supported by the Xsession script
provided by xserver-common.
Move the main part of the Xsession.d script to a script in usr/bin then
add a Xsession.d script to start it in the background.
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>
---
.../matchbox-keyboard/files/80matchboxkeyboard.sh | 3 +++
.../files/80matchboxkeyboard.shbg | 23 ----------------------
.../files/matchbox-keyboard-daemon.sh | 22 +++++++++++++++++++++
.../matchbox-keyboard/matchbox-keyboard_git.bb | 8 ++++++--
4 files changed, 31 insertions(+), 25 deletions(-)
create mode 100755 meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh
delete mode 100755 meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.shbg
create mode 100755 meta/recipes-sato/matchbox-keyboard/files/matchbox-keyboard-daemon.sh
diff --git a/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh b/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh
new file mode 100755
index 000000000000..d10fd8c32c0e
--- /dev/null
+++ b/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+/usr/bin/matchbox-keyboard-daemon.sh &
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 43c5d3ed6a32..000000000000
--- 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
diff --git a/meta/recipes-sato/matchbox-keyboard/files/matchbox-keyboard-daemon.sh b/meta/recipes-sato/matchbox-keyboard/files/matchbox-keyboard-daemon.sh
new file mode 100755
index 000000000000..2975cef7e38a
--- /dev/null
+++ b/meta/recipes-sato/matchbox-keyboard/files/matchbox-keyboard-daemon.sh
@@ -0,0 +1,22 @@
+#!/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
diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
index 00a75af60eb0..66c89ad5da41 100644
--- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
+++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
@@ -16,7 +16,8 @@ PR = "r4"
SRC_URI = "git://git.yoctoproject.org/${BPN};branch=matchbox-keyboard-0-1 \
file://single-instance.patch \
- file://80matchboxkeyboard.shbg"
+ file://matchbox-keyboard-daemon.sh \
+ file://80matchboxkeyboard.sh"
S = "${WORKDIR}/git"
@@ -41,7 +42,10 @@ 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/
+
+ install -d ${D}${bindir}
+ install -m 755 ${WORKDIR}/matchbox-keyboard-daemon.sh ${D}${bindir}/
rm -f ${D}${libdir}/gtk-2.0/*/immodules/*.la
rm -f ${D}${libdir}/matchbox-panel/*.la
--
1.8.3.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] matchbox-keyboard: daemonize launch
2014-01-17 10:09 [PATCH] matchbox-keyboard: daemonize launch Alexandre Belloni
@ 2014-01-29 13:06 ` Alexandre Belloni
0 siblings, 0 replies; 2+ messages in thread
From: Alexandre Belloni @ 2014-01-29 13:06 UTC (permalink / raw)
To: Robert Yang; +Cc: openembedded-core
Ping ?
On Fri, Jan 17, 2014 at 11:09:03 +0100, Alexandre Belloni wrote :
> The .shbg extension is not properly supported by the Xsession script
> provided by xserver-common.
>
> Move the main part of the Xsession.d script to a script in usr/bin then
> add a Xsession.d script to start it in the background.
>
> 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>
> ---
> .../matchbox-keyboard/files/80matchboxkeyboard.sh | 3 +++
> .../files/80matchboxkeyboard.shbg | 23 ----------------------
> .../files/matchbox-keyboard-daemon.sh | 22 +++++++++++++++++++++
> .../matchbox-keyboard/matchbox-keyboard_git.bb | 8 ++++++--
> 4 files changed, 31 insertions(+), 25 deletions(-)
> create mode 100755 meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh
> delete mode 100755 meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.shbg
> create mode 100755 meta/recipes-sato/matchbox-keyboard/files/matchbox-keyboard-daemon.sh
>
> diff --git a/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh b/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh
> new file mode 100755
> index 000000000000..d10fd8c32c0e
> --- /dev/null
> +++ b/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.sh
> @@ -0,0 +1,3 @@
> +#!/bin/sh
> +
> +/usr/bin/matchbox-keyboard-daemon.sh &
> 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 43c5d3ed6a32..000000000000
> --- 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
> diff --git a/meta/recipes-sato/matchbox-keyboard/files/matchbox-keyboard-daemon.sh b/meta/recipes-sato/matchbox-keyboard/files/matchbox-keyboard-daemon.sh
> new file mode 100755
> index 000000000000..2975cef7e38a
> --- /dev/null
> +++ b/meta/recipes-sato/matchbox-keyboard/files/matchbox-keyboard-daemon.sh
> @@ -0,0 +1,22 @@
> +#!/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
> diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
> index 00a75af60eb0..66c89ad5da41 100644
> --- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
> +++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb
> @@ -16,7 +16,8 @@ PR = "r4"
>
> SRC_URI = "git://git.yoctoproject.org/${BPN};branch=matchbox-keyboard-0-1 \
> file://single-instance.patch \
> - file://80matchboxkeyboard.shbg"
> + file://matchbox-keyboard-daemon.sh \
> + file://80matchboxkeyboard.sh"
>
> S = "${WORKDIR}/git"
>
> @@ -41,7 +42,10 @@ 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/
> +
> + install -d ${D}${bindir}
> + install -m 755 ${WORKDIR}/matchbox-keyboard-daemon.sh ${D}${bindir}/
>
> rm -f ${D}${libdir}/gtk-2.0/*/immodules/*.la
> rm -f ${D}${libdir}/matchbox-panel/*.la
> --
> 1.8.3.2
>
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-01-29 13:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-17 10:09 [PATCH] matchbox-keyboard: daemonize launch Alexandre Belloni
2014-01-29 13:06 ` Alexandre Belloni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox