From 23aab076251c65c283cb8d98fa1183179c3333ba Mon Sep 17 00:00:00 2001
From: John Lee <john_lee@openmoko.org>
Date: Wed, 23 Jan 2008 10:34:54 +0000
Subject: task-openmoko-feed: add swt and cacao * swt3.4-gtk * cacao
 openmoko.conf: set preferred provider to avoid bitbake confusion building
 swt3.4-gtk.

---
 conf/distro/openmoko.conf            | 5 ++++-
 packages/tasks/task-openmoko-feed.bb | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index dd6c2e0b7e..a1250afcb3 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -64,7 +64,10 @@ PACKAGE_ARCH_pn-neod_fic-gta02 = "${MACHINE_CLASS}"
 PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling"
 PREFERRED_VERSION_gtk+-fastscaling = "2.10.14"
 
+# for jalimo
+PREFERRED_PROVIDER_classpath = "classpath"
+PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
+
 # deploy gta01 and gta02 in ${MACHINE_CLASS} directory
 DEPLOY_DIR_IMAGE_fic-gta01 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"
 DEPLOY_DIR_IMAGE_fic-gta02 = "${DEPLOY_DIR}/images/${MACHINE_CLASS}"
-
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index 97f24a7624..1e52beaa42 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -34,5 +34,6 @@ RDEPENDS_task-openmoko-feed = "\
   vnc \
   wxwidgets \
   x11vnc \
+  swt3.4-gtk \
+  cacao \
 "
-
-- 
cgit v1.2.3