summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-05-17 11:31:16 +0000
committerRoss Burton <ross@openedhand.com>2007-05-17 11:31:16 +0000
commita723b0fb0555cd9dcef15b2ca754882ae2d98fd3 (patch)
tree4f620817f97cbcfb73acaa597bfb1ecd430c09ba /meta/packages
parente5b3d85ae07ba6533ce681796f25038feed64c5e (diff)
downloadpoky-a723b0fb0555cd9dcef15b2ca754882ae2d98fd3.tar.gz
Remove mbinputmgr and instead start matchbox-keyboard as required
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1748 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
-rwxr-xr-xmeta/packages/matchbox-sato/matchbox-sato/etc/matchbox/session7
-rw-r--r--meta/packages/matchbox-sato/matchbox-sato_0.1.bb2
2 files changed, 6 insertions, 3 deletions
diff --git a/meta/packages/matchbox-sato/matchbox-sato/etc/matchbox/session b/meta/packages/matchbox-sato/matchbox-sato/etc/matchbox/session
index 040ed88205..607bd2970c 100755
--- a/meta/packages/matchbox-sato/matchbox-sato/etc/matchbox/session
+++ b/meta/packages/matchbox-sato/matchbox-sato/etc/matchbox/session
@@ -10,11 +10,14 @@ SHOWCURSOR="no"
10case `module_id` in 10case `module_id` in
11 # On Zaurus models, zaurusd takes care of mbinputmgr for us in its hinge scripts 11 # On Zaurus models, zaurusd takes care of mbinputmgr for us in its hinge scripts
12 "Generic OMAP1510/1610/1710") 12 "Generic OMAP1510/1610/1710")
13 /usr/bin/mbinputmgr & 13 matchbox-keyboard --daemon &
14 ;;
15 "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi" | \
16 "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
17 matchbox-keyboard --daemon --orientation portrait &
14 ;; 18 ;;
15 # qemu machines.. likely need better detection 19 # qemu machines.. likely need better detection
16 "ARM-IntegratorCP" | "ARM-Versatile PB") 20 "ARM-IntegratorCP" | "ARM-Versatile PB")
17 /usr/bin/mbinputmgr &
18 #SHOWCURSOR="yes" 21 #SHOWCURSOR="yes"
19 ;; 22 ;;
20esac 23esac
diff --git a/meta/packages/matchbox-sato/matchbox-sato_0.1.bb b/meta/packages/matchbox-sato/matchbox-sato_0.1.bb
index 931e37d97b..0e0f37c4ef 100644
--- a/meta/packages/matchbox-sato/matchbox-sato_0.1.bb
+++ b/meta/packages/matchbox-sato/matchbox-sato_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Custom MB session files for poky"
2LICENSE = "GPL" 2LICENSE = "GPL"
3SECTION = "x11" 3SECTION = "x11"
4RDEPENDS = "matchbox matchbox-applet-startup-monitor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2" 4RDEPENDS = "matchbox matchbox-applet-startup-monitor gtk-sato-engine matchbox-theme-sato gtk-theme-sato matchbox-panel-2"
5PR = "r9" 5PR = "r10"
6 6
7SRC_URI = "file://etc" 7SRC_URI = "file://etc"
8S = ${WORKDIR} 8S = ${WORKDIR}