Revert "matchbox-keyboard: fix virtual keyboard on graphical images"
The fix was added upstream (Poky)
This reverts commit 67f5c8b103.
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
parent
aa6daab533
commit
fa215a27b8
|
|
@ -1,27 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
. /etc/formfactor/config
|
|
||||||
|
|
||||||
CMD=""
|
|
||||||
|
|
||||||
# Group the commands in a function so they can be run in background
|
|
||||||
run_keyboard() {
|
|
||||||
# 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
|
|
||||||
}
|
|
||||||
|
|
||||||
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
|
|
||||||
run_keyboard &
|
|
||||||
fi
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
# Copyright (C) 2014 Digi International.
|
|
||||||
|
|
||||||
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
|
|
||||||
|
|
||||||
SRC_URI += " \
|
|
||||||
file://80matchboxkeyboard.sh \
|
|
||||||
"
|
|
||||||
|
|
||||||
do_install_append () {
|
|
||||||
# Remove upstream '80matchboxkeyboard.shbg' file and install ours
|
|
||||||
rm -f ${D}/${sysconfdir}/X11/Xsession.d/80matchboxkeyboard.shbg
|
|
||||||
install -m 0755 ${WORKDIR}/80matchboxkeyboard.sh ${D}/${sysconfdir}/X11/Xsession.d/
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue