Integrated Element ODM packagegroup

Signed-off-by: Dragos Motrea <Dragos.Motrea@enea.com>
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>

5 files changed, 14 insertions, 0 deletions

diff --git a/conf/template.cn8304/bblayers.conf.sample b/conf/template.cn8304/bblayers.conf.sample
index 136dee1..7de8c17 100644
--- a/conf/template.cn8304/bblayers.conf.sample
+++ b/conf/template.cn8304/bblayers.conf.sample
@@ -22,4 +22,5 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-cloud-services \
   ##OEROOT##/meta-cloud-services/meta-openstack \
+  ##OEROOT##/meta-java \
   "
diff --git a/conf/template.cn8304/local.conf.sample b/conf/template.cn8304/local.conf.sample
index 86c11f5..b4bd9a2 100644
--- a/conf/template.cn8304/local.conf.sample
+++ b/conf/template.cn8304/local.conf.sample
@@ -37,6 +37,10 @@
 # This sets the default machine to be qemux86 if no other machine is selected:
 MACHINE ?= "cn8304"
 
+PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native"
+PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
+PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
+
 #
 # Where to place downloads
 #
diff --git a/conf/template.inteld1521/bblayers.conf.sample b/conf/template.inteld1521/bblayers.conf.sample
index 0902965..2ae2be9 100644
--- a/conf/template.inteld1521/bblayers.conf.sample
+++ b/conf/template.inteld1521/bblayers.conf.sample
@@ -22,4 +22,5 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-openembedded/meta-webserver \
   ##OEROOT##/meta-cloud-services \
   ##OEROOT##/meta-cloud-services/meta-openstack \
+  ##OEROOT##/meta-java \
   "
diff --git a/conf/template.inteld1521/local.conf.sample b/conf/template.inteld1521/local.conf.sample
index 1a7e915..9b7e5b5 100644
--- a/conf/template.inteld1521/local.conf.sample
+++ b/conf/template.inteld1521/local.conf.sample
@@ -37,6 +37,10 @@
 # This sets the default machine to be qemux86 if no other machine is selected:
 MACHINE ?= "inteld1521"
 
+PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native"
+PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
+PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
+
 #
 # Where to place downloads
 #
diff --git a/images/enea-image-nfv-access-host-odm.bb b/images/enea-image-nfv-access-host-odm.bb
index d325588..db0f4de 100644
--- a/images/enea-image-nfv-access-host-odm.bb
+++ b/images/enea-image-nfv-access-host-odm.bb
@@ -1,3 +1,7 @@
 DESCRIPTION = "Image for the host side of the Enea NFV Access Platform that provides ODM support"
 
 require enea-image-nfv-access-host.bb
+
+IMAGE_INSTALL += " \
+    packagegroup-enea-virtualization-element-odm \
+    "