openjdk7: remove broken/unsupported VM's

Since Shark is utterly broken and cacao and jamvm are terrible slow compared
to zero, it's pointless to support them for targets with limited resources
unless there is active maintainership taken by responsible person.

Signed-off-by: Jens Rehsack <sno@netbsd.org>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

3 files changed, 1 insertions, 46 deletions

diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc
index 6ff2a79..db47af4 100644
--- a/recipes-core/openjdk/openjdk-7-common.inc
+++ b/recipes-core/openjdk/openjdk-7-common.inc
@@ -12,8 +12,6 @@ SRC_URI = " \
   ${JAXWS_URI} \
   ${JDK_URI} \
   ${LANGTOOLS_URI} \
-  ${CACAO_URI} \
-  ${JAMVM_URI} \
   ${OEPATCHES} \
   ${ICEDTEAPATCHES} \
   file://jvm.cfg \
@@ -60,11 +58,6 @@ export CACAO_CONFIGURE_ARGS = " \
 
 JAVA_HOME[unexport] = "1"
 
-# disable shark until it is fully working again
-# WITH_ADDITIONAL_VMS ?= "--with-additional-vms=shark,cacao,jamvm"
-
-WITH_ADDITIONAL_VMS ?= "--with-additional-vms=cacao,jamvm"
-
 # OpenJDK supports parallel compilation but uses a plain number for this.
 # In OE we have PARALLEL_MAKE which is the actual option passed to make,
 # e.g. "-j 4".
@@ -110,9 +103,6 @@ EXTRA_OECONF = " \
         --with-jaxws-src-zip=${WORKDIR}/${JAXWS_FILE} \
         --with-jdk-src-zip=${WORKDIR}/${JDK_FILE} \
         --with-langtools-src-zip=${WORKDIR}/${LANGTOOLS_FILE} \
-        ${WITH_ADDITIONAL_VMS} \
-        --with-cacao-src-zip=${WORKDIR}/${CACAO_FILE} \
-        --with-jamvm-src-zip=${WORKDIR}/${JAMVM_FILE} \
         \
         --with-parallel-jobs=${JDK_JOBS} \
         \
@@ -223,10 +213,7 @@ PACKAGES = " \
             ${JDKPN}-doc \
             ${JDKPN}-jdk \
             ${JDKPN}-java \
-            ${JDKPN}-vm-shark \
             ${JDKPN}-vm-zero \
-            ${JDKPN}-vm-cacao \
-            ${JDKPN}-vm-jamvm \
             ${JDKPN}-common \
            "
 
@@ -240,9 +227,6 @@ FILES_${JDKPN}-dbg = "\
         ${JDK_HOME}/jre/lib/${JDK_ARCH}/jli/.debug \
         ${JDK_HOME}/jre/lib/${JDK_ARCH}/native_threads/.debug \
         ${JDK_HOME}/jre/lib/${JDK_ARCH}/server/.debug \
-        ${JDK_HOME}/jre/lib/${JDK_ARCH}/shark/.debug \
-        ${JDK_HOME}/jre/lib/${JDK_ARCH}/cacao/.debug \
-        ${JDK_HOME}/jre/lib/${JDK_ARCH}/jamvm/.debug \
         ${JDK_HOME}/jre/lib/${JDK_ARCH}/headless/.debug \
         ${JDK_HOME}/jre/lib/${JDK_ARCH}/xawt/.debug \
         ${JDK_HOME}/jre/lib/${JDK_ARCH}/client/.debug \
@@ -268,12 +252,6 @@ FILES_${JDKPN}-java = "${JDK_HOME}/jre/bin/java"
 
 FILES_${JDKPN}-vm-zero = "${JDK_HOME}/jre/lib/${JDK_ARCH}/server/"
 
-FILES_${JDKPN}-vm-shark = "${JDK_HOME}/jre/lib/${JDK_ARCH}/shark/"
-
-FILES_${JDKPN}-vm-cacao = "${JDK_HOME}/jre/lib/${JDK_ARCH}/cacao/"
-
-FILES_${JDKPN}-vm-jamvm = "${JDK_HOME}/jre/lib/${JDK_ARCH}/jamvm/"
-
 FILES_${JDKPN}-common = "${JDK_HOME}/jre/ASSEMBLY_EXCEPTION \
                           ${JDK_HOME}/jre/THIRD_PARTY_README \
                           ${JDK_HOME}/jre/LICENSE \
@@ -299,10 +277,7 @@ FILES_${PN}_append = " \
 
 RDEPENDS_${JDKPN}-common = "librhino-java"
 
-RPROVIDES_${JDKPN}-vm-shark = "java2-vm"
 RPROVIDES_${JDKPN}-vm-zero = "java2-vm"
-RPROVIDES_${JDKPN}-vm-cacao = "java2-vm"
-RPROVIDES_${JDKPN}-vm-jamvm = "java2-vm"
 
 # Even though a vm is a hard dependency it is set as RRECOMMENDS so a single vm can get uninstalled:
 # root@beaglebone:~/java# opkg remove openjdk-7-vm-shark
@@ -315,15 +290,9 @@ RRECOMMENDS_${JDKPN}-java = "java2-vm"
 
 # For some reason shark and cacao do not automatically depends on -common.
 # So we add that manually.
-RDEPENDS_${JDKPN}-vm-shark = "${JDKPN}-common"
-RDEPENDS_${JDKPN}-vm-cacao = "${JDKPN}-common"
-RDEPENDS_${JDKPN}-vm-jamvm = "${JDKPN}-common"
 
 # There is a symlink to a .so but this one is valid.
-INSANE_SKIP_${JDKPN}-vm-shark = "dev-so"
 INSANE_SKIP_${JDKPN}-vm-zero = "dev-so"
-INSANE_SKIP_${JDKPN}-vm-cacao = "dev-so"
-INSANE_SKIP_${JDKPN}-vm-jamvm = "dev-so"
 INSANE_SKIP_${JDKPN}-common = "dev-so"
 
 FILES_${JDKPN}-jdk = " \
diff --git a/recipes-core/openjdk/openjdk-7-release-85b01.inc b/recipes-core/openjdk/openjdk-7-release-85b01.inc
index 6a8b482..cbb28c7 100644
--- a/recipes-core/openjdk/openjdk-7-release-85b01.inc
+++ b/recipes-core/openjdk/openjdk-7-release-85b01.inc
@@ -38,18 +38,6 @@ JDK_URI = "${ICEDTEA_HG_URL}/jdk/archive/${JDK_FILE};name=jdk;unpack=false"
 LANGTOOLS_FILE = "${LANGTOOLS_CHANGESET}.tar.bz2"
 LANGTOOLS_URI = "${ICEDTEA_HG_URL}/langtools/archive/${LANGTOOLS_FILE};name=langtools;unpack=false"
 
-CACAO_VERSION = "c182f119eaad"
-CACAO_FILE = "cacao-${CACAO_VERSION}.tar.gz"
-CACAO_URI = "http://icedtea.classpath.org/download/drops/cacao/${CACAO_FILE};name=cacao;unpack=false"
-SRC_URI[cacao.md5sum] = "df428cf98e5baf28c1d186bc9b92fb01"
-SRC_URI[cacao.sha256sum] = "eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1"
-
-JAMVM_VERSION = "ec18fb9e49e62dce16c5094ef1527eed619463aa"
-JAMVM_FILE = "jamvm-${JAMVM_VERSION}.tar.gz"
-JAMVM_URI = "http://icedtea.wildebeest.org/download/drops/jamvm/${JAMVM_FILE};name=jamvm;unpack=false"
-SRC_URI[jamvm.md5sum] = "d50ae193d01a9251e10679c7a2cc6ff1"
-SRC_URI[jamvm.sha256sum] = "31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc"
-
 # Split up patches to allow overriding them separately
 OEPATCHES = "\
         file://build-hacks.patch \
diff --git a/recipes-images/images/java-test-image.bb b/recipes-images/images/java-test-image.bb
index b8a729a..005e7a1 100644
--- a/recipes-images/images/java-test-image.bb
+++ b/recipes-images/images/java-test-image.bb
@@ -7,12 +7,10 @@ IMAGE_LINGUAS = " "
 
 IMAGE_INSTALL = "busybox modutils-initscripts initscripts opkg udev sysvinit netbase base-files base-passwd \
                  ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL} \
-                 openjdk-7-jre openjdk-7-vm-zero openjdk-7-vm-jamvm openjdk-7-vm-cacao \
+                 openjdk-7-jre openjdk-7-vm-zero \
                  strace dropbear binutils \
                  classpath \
                  classpath-common \
                  classpath-examples \
                  classpath-tools \
-                 jamvm \
-                 cacao \
 "