From fb40276dd1dbef7845f93df2de53624101e3bcd2 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 18 May 2013 09:29:23 -0700
Subject: [PATCH] angstrom-java: Refresh pinned recipes

Fixes

NOTE: preferred version 1.5.2 of jamvm not available (for item jamvm)
NOTE: versions of jamvm available:
1.5.5+1.6.0-devel+gitAUTOINC+0972452d441544f7dd29c55d64f1ce3a5db90d82
NOTE: preferred version 6b24-1.11.1 of openjdk-6-jre not available (for
item openjdk-6-jre)
NOTE: versions of openjdk-6-jre available:
6b24-1.11.1+1.11.2-devel+hgAUTOINC+54ceda20a02c 6b24-1.11.9 6b27-1.12.5
NOTE: preferred version 0.98 of classpath not available (for item
classpath)
NOTE: versions of classpath available: 0.99

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 conf/distro/include/angstrom-java.inc | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/conf/distro/include/angstrom-java.inc b/conf/distro/include/angstrom-java.inc
index a0f5792..dc1f55e 100644
--- a/conf/distro/include/angstrom-java.inc
+++ b/conf/distro/include/angstrom-java.inc
@@ -1,6 +1,13 @@
-# Set PREFFERED and VERSION stuff for working java-toolchain
+# Set PREFFERED and VERSION stuff for working java runtime
 
-PREFERRED_PROVIDER_virtual/java-initial = "jamvm-initial"
-PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
-PREFERRED_VERSION_classpath-native = "0.98"
-PREFERRED_VERSION_classpath = "0.98"
+PREFERRED_VERSION_openjdk-7-jre = "03b21-2.1.8"
+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}"
+
+DEFAULTJRE ?= "openjdk-7-jre"