summaryrefslogtreecommitdiff
path: root/multitech
diff options
context:
space:
mode:
authorJesse Gilles <jgilles@multitech.com>2012-04-25 10:54:04 -0500
committerJesse Gilles <jgilles@multitech.com>2012-04-25 10:54:04 -0500
commit633c993f938be154083fd30f2f481ee0669f163c (patch)
treee39813e16ad87924cfe394ac91d91e38cd15d1e0 /multitech
parent2c54641dd2a325217a154b80bf590db0187bdd8e (diff)
images: openjdk: remove cacao, jamvm is now the default
Diffstat (limited to 'multitech')
-rw-r--r--multitech/recipes/images/corecdp-full-image.bb8
-rw-r--r--multitech/recipes/images/corecdp-openjdk-image.bb8
2 files changed, 6 insertions, 10 deletions
diff --git a/multitech/recipes/images/corecdp-full-image.bb b/multitech/recipes/images/corecdp-full-image.bb
index e1b8d1e..3943c57 100644
--- a/multitech/recipes/images/corecdp-full-image.bb
+++ b/multitech/recipes/images/corecdp-full-image.bb
@@ -30,12 +30,10 @@ IMAGE_INSTALL += "ruby"
# OpenJDK Java runtime
IMAGE_INSTALL += "openjdk-6-jre"
-# OpenJDK Zero VM (default)
-IMAGE_INSTALL += "openjdk-6-vm-zero"
-# Add the Cacao VM (run with java -cacao)
-IMAGE_INSTALL += "openjdk-6-vm-cacao"
-# Add the JamVM VM (run with java -jamvm)
+# OpenJDK with JamVM VM (Multi-Tech default)
IMAGE_INSTALL += "openjdk-6-vm-jamvm"
+# OpenJDK Zero VM (run with java -zero)
+IMAGE_INSTALL += "openjdk-6-vm-zero"
IMAGE_INSTALL += "php php-cli php-cgi"
diff --git a/multitech/recipes/images/corecdp-openjdk-image.bb b/multitech/recipes/images/corecdp-openjdk-image.bb
index 64c2076..f0f7833 100644
--- a/multitech/recipes/images/corecdp-openjdk-image.bb
+++ b/multitech/recipes/images/corecdp-openjdk-image.bb
@@ -2,12 +2,10 @@ require corecdp-base-image.bb
# OpenJDK Java runtime
IMAGE_INSTALL += "openjdk-6-jre"
-# OpenJDK Zero VM (default)
-IMAGE_INSTALL += "openjdk-6-vm-zero"
-# Add the Cacao VM (run with java -cacao)
-IMAGE_INSTALL += "openjdk-6-vm-cacao"
-# add Jamvm VM
+# OpenJDK with JamVM VM (Multi-Tech default)
IMAGE_INSTALL += "openjdk-6-vm-jamvm"
+# OpenJDK Zero VM (run with java -zero)
+IMAGE_INSTALL += "openjdk-6-vm-zero"
export IMAGE_BASENAME = "corecdp-openjdk-image"