summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Gilles <jgilles@multitech.com>2011-08-10 14:07:29 -0500
committerJesse Gilles <jgilles@multitech.com>2011-08-10 14:07:29 -0500
commit86d497a5c272426e817333bfc64d3fc87c6f0a53 (patch)
tree8b03cc7d63739e05770cb41ef82fe5f02fc90d1c
parentb13c74d4c83293b75c862cd445a1dbffac4f58a6 (diff)
corecdp: use jamvm 1.5.4, remove preferred java versions
-rw-r--r--multitech/conf/distro/corecdp.conf16
1 files changed, 3 insertions, 13 deletions
diff --git a/multitech/conf/distro/corecdp.conf b/multitech/conf/distro/corecdp.conf
index f2ee625..dc1fe5b 100644
--- a/multitech/conf/distro/corecdp.conf
+++ b/multitech/conf/distro/corecdp.conf
@@ -25,21 +25,11 @@ DEFAULT_TIMEZONE = "America/Chicago"
PREFERRED_PROVIDER_mtd-utils-static = "mtd-utils-static"
-# prevents building cacao
+# prevents building cacao, which is broken for target
PREFERRED_PROVIDER_jamvm = "jamvm"
-# Java versions that work together
-# initial verions
-PREFERRED_VERSION_jamvm-initial ?= "1.4.5"
-PREFERRED_VERSION_classpath-initial ?= "0.93"
-
-# native versions
-PREFERRED_VERSION_jamvm-native ?= "1.5.3"
-PREFERRED_VERSION_classpath-native ?= "0.98"
-
-# target device
-PREFERRED_VERSION_jamvm ?= "1.5.2"
-PREFERRED_VERSION_classpath ?= "0.98"
+# use latest jamvm
+PREFERRED_VERSION_jamvm = "1.5.4"
PREFERRED_VERSION_lighttpd = "1.4.28"