diff options
author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-11-08 16:37:43 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-11-08 16:37:43 +0000 |
commit | f412aa41ec7af1fae6a8b536365d1930da168f94 (patch) | |
tree | 2fc071a2e7be904480ba92ead31c63d0808fb326 | |
parent | e21525d7e61c88f740d23ca7e0083f2a829f0c77 (diff) | |
parent | 5479f1bbff9a1fde20e40c5ef8530262f0680309 (diff) |
merge of '3f1764c83d30f9c56414571c8dfb513f7146c49d'
and '5c37eafbefc54ff05826ce32eaad994791ea1a06'
-rw-r--r-- | packages/matchbox-common/matchbox-common_0.9.1.bb | 15 | ||||
-rw-r--r-- | packages/matchbox-common/matchbox-common_svn.bb | 15 | ||||
-rw-r--r-- | packages/openmoko2/openmoko-session2.bb | 11 | ||||
-rwxr-xr-x | packages/openmoko2/openmoko-session2/matchbox-session | 24 | ||||
-rw-r--r-- | packages/tasks/task-openmoko.bb | 3 |
5 files changed, 52 insertions, 16 deletions
diff --git a/packages/matchbox-common/matchbox-common_0.9.1.bb b/packages/matchbox-common/matchbox-common_0.9.1.bb index d2db4683e1..fa6e989b16 100644 --- a/packages/matchbox-common/matchbox-common_0.9.1.bb +++ b/packages/matchbox-common/matchbox-common_0.9.1.bb @@ -1,17 +1,20 @@ -SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager common files" +SECTION = "x11/wm" LICENSE = "GPL" DEPENDS = "libmatchbox" -PR = "r2" +PR = "r3" SRC_URI = "http://projects.o-hand.com/matchbox/sources/${PN}/0.9/${PN}-${PV}.tar.gz \ file://no-utilities-category.patch;patch=1 \ file://add-media-category.patch;patch=1" -inherit autotools pkgconfig +inherit autotools pkgconfig EXTRA_OECONF = "--enable-pda-folders" -FILES_${PN} = "${bindir} \ - ${datadir}/matchbox/vfolders \ - ${datadir}/pixmaps" +FILES_${PN} = "\ + ${bindir} \ + ${datadir}/matchbox/vfolders \ + ${datadir}/pixmaps" + +PACKAGE_ARCH = "all" diff --git a/packages/matchbox-common/matchbox-common_svn.bb b/packages/matchbox-common/matchbox-common_svn.bb index 97709bf31e..eff0642970 100644 --- a/packages/matchbox-common/matchbox-common_svn.bb +++ b/packages/matchbox-common/matchbox-common_svn.bb @@ -1,17 +1,22 @@ -SECTION = "x11/wm" DESCRIPTION = "Matchbox window manager common files" +SECTION = "x11/wm" LICENSE = "GPL" DEPENDS = "libmatchbox" PV = "0.9.1+svn${SRCDATE}" -S = "${WORKDIR}/matchbox-common" +PR = "r1" + DEFAULT_PREFERENCE = "-1" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-common;proto=http" +S = "${WORKDIR}/matchbox-common" inherit autotools pkgconfig EXTRA_OECONF = " --enable-pda-folders " -FILES_${PN} = "${bindir} \ - ${datadir}/matchbox/vfolders \ - ${datadir}/pixmaps" +FILES_${PN} = "\ + ${bindir} \ + ${datadir}/matchbox/vfolders \ + ${datadir}/pixmaps" + +PACKAGE_ARCH = "all" diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb index b71d35528d..fd1b0d30ac 100644 --- 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 index 0000000000..65f1ce72ca --- /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 $@ diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index 26b12fb795..ba5bd20a03 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -2,7 +2,7 @@ DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution" SECTION = "openmoko/base" LICENSE = "MIT" PROVIDES = "task-openmoko-everything" -PR = "r67" +PR = "r68" inherit task @@ -54,7 +54,6 @@ RDEPENDS_task-openmoko-ui = "\ pango-module-basic-x \ pango-module-basic-fc \ gtk+ \ - matchbox-common \ matchbox-wm \ xserver-kdrive-fbdev \ xserver-kdrive-common \ |