openmoko-session2: provide own matchbox-session file, get rid of matchbox-common

(which installs vfolders we don't want, we have openmoko-today2-folders for that)

diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index b71d355..fd1b0d3 100644 (file)
--- a/packages/openmoko2/openmoko-session2.bb
+++ b/packages/openmoko2/openmoko-session2.bb
@@ -1,15 +1,20 @@
 DESCRIPTION = "Custom Matchbox session files for OpenMoko"
 LICENSE = "GPL"
 SECTION = "x11"
-RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
+RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2"
 RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
 RCONFLICTS = "openmoko-session"
-PR = "r37"
+PR = "r39"
 
-SRC_URI = "file://etc"
+SRC_URI = "\
+  file://etc \
+  file://matchbox-session \
+"
 S = ${WORKDIR}
 
 do_install() {
+       install -d ${D}${bindir}
+       install -m 0655 ${WORKDIR}/matchbox-session ${D}${bindir}
        install -d ${D}${sysconfdir}
        cp -R ${S}/etc/* ${D}${sysconfdir}
        rm -fR ${D}${sysconfdir}/.svn

diff --git a/packages/openmoko2/openmoko-session2/matchbox-session b/packages/openmoko2/openmoko-session2/matchbox-session
new file mode 100755 (executable)
index 0000000..65f1ce7
--- /dev/null
+++ b/packages/openmoko2/openmoko-session2/matchbox-session
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# Very simple session manager for matchbox tools
+#
+
+# Uncomment below to enable parsing of debian menu entrys
+# export MB_USE_DEB_MENUS=1 
+
+if [ -e $HOME/.matchbox/session ]
+then
+exec $HOME/.matchbox/session
+fi
+
+if [ -e /etc/matchbox/session ]
+then
+exec /etc/matchbox/session
+fi
+
+# Default files to run if $HOME/.matchbox/session or /etc/matchbox/session
+# dont exist. 
+
+matchbox-desktop &
+matchbox-panel  --orientation south &
+exec matchbox-window-manager $@