diff options
| author | Jesse Gilles <jgilles@multitech.com> | 2012-01-31 13:48:18 -0600 |
|---|---|---|
| committer | Jesse Gilles <jgilles@multitech.com> | 2012-03-13 13:18:00 -0500 |
| commit | 05d57435e3d88d8794c2fb411c54d1960503bc9c (patch) | |
| tree | 8d9950023c3635132ca0faf940c00142ba254eb6 | |
| parent | 3c94a4a58a67fbc44b988a89462310eaab23991c (diff) | |
corecdp: use latest openjdk and jamvm from meta-java layer
| -rw-r--r-- | multitech/conf/distro/corecdp.conf | 10 | ||||
| -rw-r--r-- | multitech/conf/distro/java.inc | 26 |
2 files changed, 31 insertions, 5 deletions
diff --git a/multitech/conf/distro/corecdp.conf b/multitech/conf/distro/corecdp.conf index a1252ab..042317c 100644 --- a/multitech/conf/distro/corecdp.conf +++ b/multitech/conf/distro/corecdp.conf @@ -23,6 +23,9 @@ INHERIT += "corecdp-mirrors" INHERIT += "corecdp_metadata_scm" +# add bbnote, etc +INHERIT += "logging" + IPKG_VARIANT = "opkg corecdp-version" # use busybox instead of tinylogin @@ -34,11 +37,8 @@ PREFERRED_VERSION_mtd-utils = "1.4.4" PREFERRED_VERSION_mtd-utils_static = "1.4.4" PREFERRED_PROVIDER_mtd-utils-static = "mtd-utils-static" -# prevents building cacao -PREFERRED_PROVIDER_jamvm = "jamvm" - -# use latest jamvm -PREFERRED_VERSION_jamvm = "1.5.4" +# java versions from meta-java +require java.inc PREFERRED_VERSION_lighttpd = "1.4.28" diff --git a/multitech/conf/distro/java.inc b/multitech/conf/distro/java.inc new file mode 100644 index 0000000..7f946c0 --- /dev/null +++ b/multitech/conf/distro/java.inc @@ -0,0 +1,26 @@ +# Java verions from meta-java layer + +# use jamvm as default java runtime +PREFERRED_PROVIDER_jamvm = "jamvm" + +# initial stuff +PREFERRED_VERSION_jamvm-initial = "1.4.5" +PREFERRED_VERSION_classpath-initial = "0.93" + +PREFERRED_VERSION_classpath-native = "0.98" + +PREFERRED_PROVIDER_virtual/java-native = "jamvm-native" +PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" + +# use latest jamvm +PREFERRED_VERSION_jamvm = "" +PREFERRED_VERSION_jamvm-native = "" + +PREFERRED_VERSION_libecj-bootstrap = "3.6.2" + +PREFERRED_VERSION_cacaoh-native = "0.99.4" +PREFERRED_VERSION_cacao = "0.99.4" + +# use latest openjdk +PREFERRED_VERSION_openjdk-6-jre = "" +PREFERRED_VERSION_icedtea6-native = "1.8.11" |