diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-07-30 23:34:06 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-07-30 23:34:06 +0000 |
| commit | 541f656ea246ee025650961a2bac6c48e8ac0dde (patch) | |
| tree | 62271eff8913a229a384438cad7a73615b0786b3 /packages | |
| parent | b350099f15032f0c9ee22ae29c74b624d9666a4a (diff) | |
openmoko-session2: don't ship $bindir/matchbox-session, rather depend on matchbox-common
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/openmoko2/openmoko-session2.bb | 8 | ||||
| -rw-r--r-- | packages/openmoko2/openmoko-session2/matchbox-session | 24 |
2 files changed, 3 insertions, 29 deletions
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index 006948109f..d24d57e008 100644 --- a/packages/openmoko2/openmoko-session2.bb +++ b/packages/openmoko2/openmoko-session2.bb @@ -1,16 +1,14 @@ DESCRIPTION = "Custom MB session files for poky" LICENSE = "GPL" SECTION = "x11" -RDEPENDS = "matchbox-applet-startup-monitor matchbox-panel-2" -RCONFLICTS = "matchbox-common openmoko-session" -PR = "r20" +RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2" +RCONFLICTS = "openmoko-session" +PR = "r21" SRC_URI = "file://etc file://matchbox-session" S = ${WORKDIR} do_install() { - install -d ${D}/${bindir} - install -m 0755 ${S}/matchbox-session ${D}/${bindir} cp -R ${S}/etc ${D}/etc rm -fR ${D}/etc/.svn rm -fR ${D}/etc/matchbox/.svn diff --git a/packages/openmoko2/openmoko-session2/matchbox-session b/packages/openmoko2/openmoko-session2/matchbox-session deleted file mode 100644 index 658ce4bcfc..0000000000 --- a/packages/openmoko2/openmoko-session2/matchbox-session +++ /dev/null @@ -1,24 +0,0 @@ -#!/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-2 & -matchbox-panel-2 --orientation south & -exec matchbox-window-manager $@ |