summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/include/preferred-shr-versions.inc4
-rw-r--r--conf/distro/shr.conf2
2 files changed, 5 insertions, 1 deletions
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index d4a787235e..5970f2da14 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -8,6 +8,10 @@ PREFERRED_VERSION_libmikmod ?= "3.2.0-beta2"
PREFERRED_VERSION_mtd-utils-native ?= "1.2.0+git"
PREFERRED_VERSION_strace ?= "4.5.15"
+# We need this for jamvm
+PREFERRED_VERSION_classpath ?= "0.98"
+PREFERRED_VERSION_classpath-native ?= "0.98"
+
# we need new headers for libc, now OLDEST_KERNEL_linux-gnueabi = "2.6.24"
PREFERRED_VERSION_linux-libc-headers = "2.6.29"
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 6740e24feb..5b0b29a175 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -169,7 +169,7 @@ PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
PREFERRED_PROVIDER_virtual/gail = "gtk+"
PREFERRED_PROVIDER_opkg = "opkg"
-PREFERRED_PROVIDER_virtual/java-initial = "cacao-initial"
+PREFERRED_PROVIDER_virtual/java-initial = "jamvm-initial"
PREFERRED_PROVIDER_atd = "atd-over-fso"
PREFERRED_PROVIDER_qt4x11 = "qt4-x11-free"
PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"