summaryrefslogtreecommitdiff
path: root/multitech/conf/distro/corecdp.conf
diff options
context:
space:
mode:
authorJesse Gilles <jgilles@multitech.com>2012-01-31 13:48:18 -0600
committerJesse Gilles <jgilles@multitech.com>2012-03-13 13:18:00 -0500
commit05d57435e3d88d8794c2fb411c54d1960503bc9c (patch)
tree8d9950023c3635132ca0faf940c00142ba254eb6 /multitech/conf/distro/corecdp.conf
parent3c94a4a58a67fbc44b988a89462310eaab23991c (diff)
corecdp: use latest openjdk and jamvm from meta-java layer
Diffstat (limited to 'multitech/conf/distro/corecdp.conf')
-rw-r--r--multitech/conf/distro/corecdp.conf10
1 files changed, 5 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"