summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Gilles <jgilles@multitech.com>2011-09-19 16:43:50 -0500
committerJesse Gilles <jgilles@multitech.com>2011-09-19 16:43:50 -0500
commit29075169969b367cc95e0902c240263c4c40c61f (patch)
tree02001826145c7a7402aed69d48e160738a069109
parent3ee6c4f3b12d223075ad078974f3e40fa8fb3a88 (diff)
add Cacaco VM to OpenJDK images
-rw-r--r--multitech/recipes/images/corecdp-full-image.bb6
-rw-r--r--multitech/recipes/images/corecdp-openjdk-image.bb6
2 files changed, 10 insertions, 2 deletions
diff --git a/multitech/recipes/images/corecdp-full-image.bb b/multitech/recipes/images/corecdp-full-image.bb
index 7ca305d..da60009 100644
--- a/multitech/recipes/images/corecdp-full-image.bb
+++ b/multitech/recipes/images/corecdp-full-image.bb
@@ -28,8 +28,12 @@ IMAGE_INSTALL += "python-sqlite3"
IMAGE_INSTALL += "ruby"
-# Java
+# 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"
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 11b0f91..0944ee1 100644
--- a/multitech/recipes/images/corecdp-openjdk-image.bb
+++ b/multitech/recipes/images/corecdp-openjdk-image.bb
@@ -1,7 +1,11 @@
require corecdp-base-image.bb
-# Java VM
+# 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"
export IMAGE_BASENAME = "corecdp-openjdk-image"