From 29075169969b367cc95e0902c240263c4c40c61f Mon Sep 17 00:00:00 2001 From: Jesse Gilles Date: Mon, 19 Sep 2011 16:43:50 -0500 Subject: add Cacaco VM to OpenJDK images --- multitech/recipes/images/corecdp-full-image.bb | 6 +++++- multitech/recipes/images/corecdp-openjdk-image.bb | 6 +++++- 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" -- cgit v1.2.3