task-openmoko-feed: add swt and cacao

* swt3.4-gtk
* cacao
openmoko.conf: set preferred provider to avoid bitbake confusion building
swt3.4-gtk.

diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index dd6c2e0..a1250af 100644 (file)
--- 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 97f24a7..1e52bea 100644 (file)
--- 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 \
 "
-