summaryrefslogtreecommitdiff
path: root/meta/packages/matchbox-poky
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-07-28 15:01:05 +0000
committerRichard Purdie <richard@openedhand.com>2006-07-28 15:01:05 +0000
commit064c64325314dd70270af104bd6a8268e7e4e9d0 (patch)
treefd7e9a718a6447e4e2084708dec1c5637049848f /meta/packages/matchbox-poky
parent24a329f39c11322867c7c9c3ac4c10e67d9f1dd6 (diff)
downloadopenembedded-core-064c64325314dd70270af104bd6a8268e7e4e9d0.tar.gz
openembedded-core-064c64325314dd70270af104bd6a8268e7e4e9d0.tar.bz2
openembedded-core-064c64325314dd70270af104bd6a8268e7e4e9d0.tar.xz
openembedded-core-064c64325314dd70270af104bd6a8268e7e4e9d0.zip
matchbox-poky: Remove references to chkhinge26 as zaurusd now handles this. Correct theme key and force gconftool-2 to run on device (at least until we debug other issues)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@574 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/matchbox-poky')
-rwxr-xr-xmeta/packages/matchbox-poky/matchbox-poky/etc/matchbox/session4
-rw-r--r--meta/packages/matchbox-poky/matchbox-poky_0.1.bb8
2 files changed, 7 insertions, 5 deletions
diff --git a/meta/packages/matchbox-poky/matchbox-poky/etc/matchbox/session b/meta/packages/matchbox-poky/matchbox-poky/etc/matchbox/session
index 90073e0f1..a3dd6e56a 100755
--- a/meta/packages/matchbox-poky/matchbox-poky/etc/matchbox/session
+++ b/meta/packages/matchbox-poky/matchbox-poky/etc/matchbox/session
@@ -8,9 +8,7 @@ SHOWCURSOR="no"
## Start up machine specific input devices. Really needs to go in its own session
case `module_id` in
- "SHARP Shepherd" | "SHARP Husky" | "SHARP Corgi" | "SHARP Spitz" | "SHARP Akita" | "SHARP Borzoi")
- chkhinge26 /dev/input/event0 hinge-handler &
- ;;
+ # On Zaurus models, zaurusd takes care of mbinputmgr for us in its hinge scripts
"Generic OMAP1510/1610/1710")
/usr/bin/mbinputmgr &
;;
diff --git a/meta/packages/matchbox-poky/matchbox-poky_0.1.bb b/meta/packages/matchbox-poky/matchbox-poky_0.1.bb
index 4eae59007..7a4eb7299 100644
--- a/meta/packages/matchbox-poky/matchbox-poky_0.1.bb
+++ b/meta/packages/matchbox-poky/matchbox-poky_0.1.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Custom MB session files for poky"
LICENSE = "GPL"
SECTION = "x11"
RDEPENDS = "matchbox matchbox-applet-startup-monitor gtk-theme-clearlooks"
-PR = "r16"
+PR = "r19"
SRC_URI = "file://etc"
S = ${WORKDIR}
@@ -16,5 +16,9 @@ do_install() {
pkg_postinst_matchbox-poky () {
#!/bin/sh -e
-gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/theme Clearlooks
+if [ "x$D" != "x" ]; then
+ exit 1
+fi
+
+gconftool-2 --config-source=xml::$D${sysconfdir}/gconf/gconf.xml.defaults --direct --type string --set /desktop/poky/interface/theme Clearlooks
}