[oe-commits] org.oe.dev openmoko-session2: provide own matchbox-session file, get rid of matchbox-common

[mickeyl commit]

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)

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 33d934f3ba763a740b76a5ccd66fa5dd71f7d732
ViewMTN: http://monotone.openembedded.org/revision/info/33d934f3ba763a740b76a5ccd66fa5dd71f7d732
Files:
1
packages/openmoko2/openmoko-session2/matchbox-session
packages/openmoko2/openmoko-session2.bb
mtn:execute
true
Diffs:

#
# mt diff -r501fc85e47fd29aa032aca2fd04e28c42059d79d -r33d934f3ba763a740b76a5ccd66fa5dd71f7d732
#
# 
# 
# add_file "packages/openmoko2/openmoko-session2/matchbox-session"
#  content [c32dbae334b8f44e316abb4125fc51398d09f80e]
# 
# patch "packages/openmoko2/openmoko-session2.bb"
#  from [9b29d38583ef7d185640dabf6d55da8fb198f056]
#    to [cc3fb3acd8a64a6ec187b76f9aa4736fe8d52555]
# 
#   set "packages/openmoko2/openmoko-session2/matchbox-session"
#  attr "mtn:execute"
# value "true"
# 
============================================================
--- packages/openmoko2/openmoko-session2/matchbox-session	c32dbae334b8f44e316abb4125fc51398d09f80e
+++ packages/openmoko2/openmoko-session2/matchbox-session	c32dbae334b8f44e316abb4125fc51398d09f80e
@@ -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 $@
============================================================
--- packages/openmoko2/openmoko-session2.bb	9b29d38583ef7d185640dabf6d55da8fb198f056
+++ packages/openmoko2/openmoko-session2.bb	cc3fb3acd8a64a6ec187b76f9aa4736fe8d52555
@@ -1,15 +1,20 @@ SECTION = "x11"
 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