4 files changed, 8 insertions, 35 deletions

diff --git a/recipes-core/cacao/cacao_1.6.1.bb b/recipes-core/cacao/cacao_1.6.1.bb
index ce1ffc2..8e212af 100644
--- a/recipes-core/cacao/cacao_1.6.1.bb
+++ b/recipes-core/cacao/cacao_1.6.1.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 SECTION  = "interpreters"
 
 DEPENDS_class-native = "zlib-native libtool-native ecj-initial-native fastjar-native classpath-native bdwgc-native"
-#PROVIDES_class-native = "virtual/java-native"
+PROVIDES_class-native = "virtual/java-native"
 
 DEPENDS = "zlib libtool classpath virtual/javac-native bdwgc"
 RPROVIDES_${PN} = "java2-runtime"
diff --git a/recipes-core/ecj/ecj-bootstrap-native.bb b/recipes-core/ecj/ecj-bootstrap-native.bb
index 94ce6aa..e159c9d 100644
--- a/recipes-core/ecj/ecj-bootstrap-native.bb
+++ b/recipes-core/ecj/ecj-bootstrap-native.bb
@@ -14,6 +14,8 @@ PR = "r1"
 
 DEPENDS = "libecj-bootstrap-native virtual/java-native"
 
+PROVIDES = "virtual/javac-native"
+
 SRC_URI = "file://ecj.in"
 
 S = "${WORKDIR}"
diff --git a/recipes-core/openjdk/openjdk-8-native.inc b/recipes-core/openjdk/openjdk-8-native.inc
index 7813ec2..7a37d1a 100644
--- a/recipes-core/openjdk/openjdk-8-native.inc
+++ b/recipes-core/openjdk/openjdk-8-native.inc
@@ -68,15 +68,12 @@ do_compile_append() {
 }
 
 do_install() {
-    rm -rf ${STAGING_LIBDIR_NATIVE}/jvm/${JDK_DIR}
-    mkdir -p ${STAGING_LIBDIR_NATIVE}/jvm/${JDK_DIR}
-    cp -rp ${B}/images/j2sdk-image/* ${STAGING_LIBDIR_NATIVE}/jvm/${JDK_DIR}
+    mkdir -p ${D}${libdir_jvm}/${JDK_DIR}
+    cp -rp ${B}/images/j2sdk-image/* ${D}${libdir_jvm}/${JDK_DIR}
 
-# clean up the mess from bootstrap
-    for tool in jar java javac keytool pack200 unpack200
+    mkdir -p ${D}${bindir}
+    for tool in keytool pack200 unpack200
     do
-        rm -f ${STAGING_BINDIR_NATIVE}/$tool
-
-        ln -sf "../lib/jvm/${JDK_DIR}/bin/$tool" ${STAGING_BINDIR_NATIVE}/$tool
+        ln -sf "../lib/jvm/${JDK_DIR}/bin/$tool" ${D}${bindir}/$tool
     done
 }
diff --git a/recipes-core/openjdk/openjdk-8-native_72b05.bb b/recipes-core/openjdk/openjdk-8-native_72b05.bb
index 6eb40eb..7b20248 100644
--- a/recipes-core/openjdk/openjdk-8-native_72b05.bb
+++ b/recipes-core/openjdk/openjdk-8-native_72b05.bb
@@ -1,28 +1,2 @@
 require openjdk-8-release-72b05.inc
 require openjdk-8-native.inc
-
-PROVIDES = "virtual/java-native virtual/javac-native"
-
-inherit update-alternatives
-
-ALTERNATIVE_${PN} = "java javac jar pack200 unpack200 keytool"
-ALTERNATIVE_LINK[java] = "${bindir}/java"
-ALTERNATIVE_TARGET[java] = "${JDK_HOME}/bin/java"
-ALTERNATIVE_PRIORITY[java] = "100"
-ALTERNATIVE_LINK[javac] = "${bindir}/javac"
-ALTERNATIVE_TARGET[javac] = "${JDK_HOME}/bin/javac"
-ALTERNATIVE_PRIORITY[javac] = "100"
-ALTERNATIVE_LINK[jar] = "${bindir}/jar"
-ALTERNATIVE_TARGET[jar] = "${JDK_HOME}/bin/jar"
-ALTERNATIVE_PRIORITY[jar] = "100"
-ALTERNATIVE_LINK[pack200] = "${bindir}/pack200"
-ALTERNATIVE_TARGET[pack200] = "${JDK_HOME}/bin/pack200"
-ALTERNATIVE_PRIORITY[pack200] = "100"
-ALTERNATIVE_LINK[unpack200] = "${bindir}/unpack200"
-ALTERNATIVE_TARGET[unpack200] = "${JDK_HOME}/bin/unpack200"
-ALTERNATIVE_PRIORITY[unpack200] = "100"
-ALTERNATIVE_LINK[keytool] = "${bindir}/keytool"
-ALTERNATIVE_TARGET[keytool] = "${JDK_HOME}/bin/keytool"
-ALTERNATIVE_PRIORITY[keytool] = "100"
-
-# PR = "${INC_PR}.1"