6 files changed, 28 insertions, 5 deletions
diff --git a/packages/openmoko2/neod_svn.bb b/packages/openmoko2/neod_svn.bb
index 4d6115ae93..b382fc2c88 100644
--- a/packages/openmoko2/neod_svn.bb
+++ b/packages/openmoko2/neod_svn.bb
@@ -5,3 +5,14 @@ PV = "0.1.0+svn${SVNREV}"
 PR = "r0"
 
 inherit openmoko2 gconf
+
+EXTRA_OECONF_fic-gta01 = "--with-platform=neo1973"
+EXTRA_OECONF_fic-gta02 = "--with-platform=neo1973"
+EXTRA_OECONF_a780      = "--with-platform=ezx"
+EXTRA_OECONF_a1200     = "--with-platform=ezx"
+EXTRA_OECONF_e680      = "--with-platform=ezx"
+EXTRA_OECONF_rokre2    = "--with-platform=ezx"
+EXTRA_OECONF_rokre6    = "--with-platform=ezx"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
diff --git a/packages/openmoko2/openmoko-common2_svn.bb b/packages/openmoko2/openmoko-common2_svn.bb
index f54a23de18..0cf7f763cb 100644
--- a/packages/openmoko2/openmoko-common2_svn.bb
+++ b/packages/openmoko2/openmoko-common2_svn.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Common files for the OpenMoko distribution"
 SECTION = "openmoko/base"
-PV = "0.0+svn${SRCDATE}"
+PV = "0.0+svnr${SRCREV}"
 PR = "r3"
 
 inherit openmoko2
diff --git a/packages/openmoko2/openmoko-dates2_svn.bb b/packages/openmoko2/openmoko-dates2_svn.bb
new file mode 100644
index 0000000000..9650a20b0d
--- /dev/null
+++ b/packages/openmoko2/openmoko-dates2_svn.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "The OpenMoko Calendar"
+SECTION = "openmoko/pim"
+DEPENDS = "libmokoui2 libmokojournal2 gtk+ libglade eds-dbus"
+RDEPENDS = "libedata-cal"
+PV = "0.1.0+svn${SVNREV}"
+
+inherit openmoko2
+
+SRC_URI = "svn://svn.o-hand.com/repos/dates/branches;module=jana;proto=http"
+S = "${WORKDIR}/jana/"
+
+EXTRA_OECONF = "--with-frontend=openmoko"
diff --git a/packages/openmoko2/openmoko-session2.bb b/packages/openmoko2/openmoko-session2.bb
index 31d38382df..de2d7cdff6 100644
--- a/packages/openmoko2/openmoko-session2.bb
+++ b/packages/openmoko2/openmoko-session2.bb
@@ -4,7 +4,7 @@ SECTION = "x11"
 RDEPENDS = "matchbox-common matchbox-applet-startup-monitor matchbox-panel-2"
 RDEPENDS += "openmoko-common2 openmoko-today2 openmoko-dialer2"
 RCONFLICTS = "openmoko-session"
-PR = "r30"
+PR = "r31"
 
 SRC_URI = "file://etc"
 S = ${WORKDIR}
diff --git a/packages/openmoko2/openmoko-session2/etc/matchbox/session b/packages/openmoko2/openmoko-session2/etc/matchbox/session
index dee3e58051..4f2f8ae110 100755
--- a/packages/openmoko2/openmoko-session2/etc/matchbox/session
+++ b/packages/openmoko2/openmoko-session2/etc/matchbox/session
@@ -9,6 +9,6 @@ openmoko-dialer &
 matchbox-window-manager -use_titlebar yes -use_desktop_mode decorated -theme openmoko-standard-2 -use_cursor $SHOWCURSOR $@ &
 
 matchbox-panel-2 --start-applets systray,startup \
-  --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock --titlebar &
+  --end-applets openmoko-panel-battery,openmoko-panel-gsm,openmoko-panel-gps,openmoko-panel-usb,openmoko-panel-bt,openmoko-panel-clock,keyboard --titlebar &
 
 exec neod
diff --git a/packages/openmoko2/openmoko-terminal2_svn.bb b/packages/openmoko2/openmoko-terminal2_svn.bb
index dc9acfec14..1c27a07d76 100644
--- a/packages/openmoko2/openmoko-terminal2_svn.bb
+++ b/packages/openmoko2/openmoko-terminal2_svn.bb
@@ -1,7 +1,7 @@
 DESCRIPTION = "The OpenMoko Command Line Console"
 SECTION = "openmoko/applications"
-DEPENDS = "libmokoui2 vte"
+DEPENDS = "vte libmokoui2"
 PV = "2.1.0+${SVNREV}"
-PR = "r0"
+PR = "r1"
 
 inherit openmoko2