[oe-commits] org.oe.dev merge of '3f1764c83d30f9c56414571c8dfb513f7146c49d'

[oe commit]

merge of '3f1764c83d30f9c56414571c8dfb513f7146c49d'
     and '5c37eafbefc54ff05826ce32eaad994791ea1a06'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 3c1e9b977e3934950deafec3a4b97deb9af92e70
ViewMTN: http://monotone.openembedded.org/revision/info/3c1e9b977e3934950deafec3a4b97deb9af92e70
Files:
1
packages/openmoko2/openmoko-session2/matchbox-session
packages/matchbox-common/matchbox-common_0.9.1.bb
packages/matchbox-common/matchbox-common_svn.bb
packages/openmoko2/openmoko-session2.bb
packages/tasks/task-openmoko.bb
mtn:execute
true
conf/distro/angstrom-2008.1.conf
Diffs:

#
# mt diff -r3f1764c83d30f9c56414571c8dfb513f7146c49d -r3c1e9b977e3934950deafec3a4b97deb9af92e70
#
# 
# 
# add_file "packages/openmoko2/openmoko-session2/matchbox-session"
#  content [c32dbae334b8f44e316abb4125fc51398d09f80e]
# 
# patch "packages/matchbox-common/matchbox-common_0.9.1.bb"
#  from [2b1d99f38f0addaaf9b3574f188fd90576231c01]
#    to [bddf9d7d1a113a7b887c375bef97a8a3174105be]
# 
# patch "packages/matchbox-common/matchbox-common_svn.bb"
#  from [68e1cd286264112e4db777b54678f5dc3a6ffc13]
#    to [82da4dd192a06a266ab06f22b05743a11900d7c5]
# 
# patch "packages/openmoko2/openmoko-session2.bb"
#  from [9b29d38583ef7d185640dabf6d55da8fb198f056]
#    to [cc3fb3acd8a64a6ec187b76f9aa4736fe8d52555]
# 
# patch "packages/tasks/task-openmoko.bb"
#  from [c7424f4f0bbda5341fad86b6fbb43047abeee781]
#    to [5dc5506edaaf3e889cc37fc49dda94c482b1d8c3]
# 
#   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/matchbox-common/matchbox-common_0.9.1.bb	2b1d99f38f0addaaf9b3574f188fd90576231c01
+++ packages/matchbox-common/matchbox-common_0.9.1.bb	bddf9d7d1a113a7b887c375bef97a8a3174105be
@@ -1,17 +1,20 @@
+DESCRIPTION = "Matchbox window manager common files"
 SECTION = "x11/wm"
-DESCRIPTION = "Matchbox window manager common files"
 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"
+
+PACKAGE_ARCH = "all"
-FILES_${PN} = "${bindir} \
-	       ${datadir}/matchbox/vfolders \
-	       ${datadir}/pixmaps"
============================================================
--- packages/matchbox-common/matchbox-common_svn.bb	68e1cd286264112e4db777b54678f5dc3a6ffc13
+++ packages/matchbox-common/matchbox-common_svn.bb	82da4dd192a06a266ab06f22b05743a11900d7c5
@@ -1,17 +1,22 @@
+DESCRIPTION = "Matchbox window manager common files"
 SECTION = "x11/wm"
-DESCRIPTION = "Matchbox window manager common files"
 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"
+
+PACKAGE_ARCH = "all"
-FILES_${PN} = "${bindir} \
-	       ${datadir}/matchbox/vfolders \
-	       ${datadir}/pixmaps"
============================================================
--- 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
============================================================
--- packages/tasks/task-openmoko.bb	c7424f4f0bbda5341fad86b6fbb43047abeee781
+++ packages/tasks/task-openmoko.bb	5dc5506edaaf3e889cc37fc49dda94c482b1d8c3
@@ -1,8 +1,8 @@ PROVIDES = "task-openmoko-everything"
 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 \


#
# mt diff -r5c37eafbefc54ff05826ce32eaad994791ea1a06 -r3c1e9b977e3934950deafec3a4b97deb9af92e70
#
# 
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [b57f91c4b69991f51bbaf3bbdea9681d1bba1e6e]
#    to [cdd382dd48e69a1cb0f7a98b39f63aa1a7130540]
# 
============================================================
--- conf/distro/angstrom-2008.1.conf	b57f91c4b69991f51bbaf3bbdea9681d1bba1e6e
+++ conf/distro/angstrom-2008.1.conf	cdd382dd48e69a1cb0f7a98b39f63aa1a7130540
@@ -70,7 +70,10 @@ PREFERRED_VERSION_glibc-initial 	= "2.6.
 PREFERRED_VERSION_glibc 		= "2.6.1"
 PREFERRED_VERSION_glibc-intermediate 	= "2.6.1"
 PREFERRED_VERSION_glibc-initial 	= "2.6.1"
+PREFERRED_VERSION_uclibc ?= "0.9.29"
+PREFERRED_VERSION_uclibc-initial ?= "0.9.29"
 
+
 #Prefer a newer GTK+ and friends
 PREFERRED_VERSION_gtk+             	= "2.12.0"
 PREFERRED_VERSION_glib-2.0              = "2.14.0"