From 001ae5dba2b8573b896fecbed43f2af57804847a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 27 Jan 2016 00:51:04 +0100 Subject: [PATCH] don't pin java version and follow meta-java's suggestions for default provider MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- conf/distro/include/angstrom-jalimo.conf | 3 ++- conf/distro/include/angstrom-java.inc | 10 ++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/conf/distro/include/angstrom-jalimo.conf b/conf/distro/include/angstrom-jalimo.conf index 63d140f..45058b7 100644 --- a/conf/distro/include/angstrom-jalimo.conf +++ b/conf/distro/include/angstrom-jalimo.conf @@ -1,8 +1,9 @@ # Put a 'require conf/distro/include/angstrom-jalimo.conf' in your local.conf if you want to build from the jalimo overlay +# Possible provider: cacao-native and jamvm-native PREFERRED_PROVIDER_virtual/java-native = "jamvm-native" -# Native compiler settings +# Optional since there is only one provider for now PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" # Target VM diff --git a/conf/distro/include/angstrom-java.inc b/conf/distro/include/angstrom-java.inc index c96eeff..61637e2 100644 --- a/conf/distro/include/angstrom-java.inc +++ b/conf/distro/include/angstrom-java.inc @@ -1,15 +1,9 @@ # Set PREFFERED and VERSION stuff for working java runtime -PREFERRED_VERSION_openjdk-7-jre = "75b13-2.5.4" -PREFERRED_VERSION_icedtea7-native = "2.1.3" - -# jamvm -PREFERRED_VERSION_jamvm = "1.5.5+1.6.0-devel+git%" -PREFERRED_VERSION_jamvm-native = "1.5.5+1.6.0-devel+git%" - PREFERRED_PROVIDER_java2-vm = "${DEFAULTJRE}" PREFERRED_PROVIDER_java2-runtime = "${DEFAULTJRE}" PREFERRED_PROVIDER_openjdk-7-jre = "${DEFAULTJRE}" -PREFERRED_PROVIDER_virtual/java-initial-native = "jamvm-initial-native" +# Possible provider: cacao-initial-native and jamvm-initial-native +PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native" DEFAULTJRE ?= "openjdk-7-jre"