6 files changed, 15 insertions, 46 deletions

diff --git a/images/enea-nfv-access-dev.bb b/images/enea-nfv-access-dev.bb
deleted file mode 100644
index 7e10642..0000000
--- a/images/enea-nfv-access-dev.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "Image for the host side of the Enea NFV Access Platform"
-
-require images/enea-nfv-access-host-common.inc
-
-IMAGE_INSTALL += " \
-    packagegroup-enea-virtualization-element-odm \
-    packagegroup-enea-virtualization-tools \
-    kernel-devsrc \
-    "
-
-IMAGE_FEATURES += "dbg-pkgs dev-pkgs"
-
-IMAGE_FSTYPES += "tar.gz"
-
-# Due to a legacy include from corei7 machine we need to stop building following images
-NOHDD = "1"
-NOISO = "1"
-INITRD_IMAGE_LIVE = ""
diff --git a/images/enea-nfv-access-odm.bb b/images/enea-nfv-access-edgelink-netconf.bb
index 9c65236..cfaffb7 100644
--- a/images/enea-nfv-access-odm.bb
+++ b/images/enea-nfv-access-edgelink-netconf.bb
@@ -1,9 +1,8 @@
-DESCRIPTION = "Image for the host side of the Enea NFV Access Platform with ODM customizations"
-LICENSE=""
+DESCRIPTION = "Image for the host side of the Enea NFV Access Platform with ODM and NETCONF Edgelink customizations"
+
 require images/enea-nfv-access-host-common.inc
 
 IMAGE_INSTALL += " \
-    packagegroup-enea-virtualization-element-odm \
-    element-odm \
     nfv-init-host \
+    element-vcpe \
     "
diff --git a/images/enea-nfv-access-guest-dev.bb b/images/enea-nfv-access-guest-dev.bb
deleted file mode 100644
index 471d316..0000000
--- a/images/enea-nfv-access-guest-dev.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-DESCRIPTION = "Image for the guest side of the Enea NFV Access Platform"
-
-require images/enea-nfv-access-common.inc
-
-IMAGE_INSTALL += " \
-    packagegroup-enea-virtualization-guest \
-    packagegroup-enea-virtualization-tools \
-    kernel-devsrc \
-    "
-
-IMAGE_FEATURES += "dbg-pkgs dev-pkgs"
-
-IMAGE_FSTYPES += "ext4.qcow2"
diff --git a/images/enea-nfv-access-guest.bb b/images/enea-nfv-access-guest.bb
deleted file mode 100644
index 0359de4..0000000
--- a/images/enea-nfv-access-guest.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "Image for the guest side of the Enea NFV Access Platform"
-
-require images/enea-nfv-access-common.inc
-
-IMAGE_INSTALL += " \
-    packagegroup-enea-virtualization-guest \
-    "
-
-IMAGE_FSTYPES += "ext4.qcow2"
diff --git a/images/enea-nfv-access-sdk.bb b/images/enea-nfv-access-sdk.bb
new file mode 100644
index 0000000..0606ace
--- /dev/null
+++ b/images/enea-nfv-access-sdk.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Image for building the SDK for the host side of the Enea NFV Access Platform with ODM customizations"
+
+require images/enea-nfv-access-host-common.inc
+
+IMAGE_INSTALL += " \
+    element-odm \
+    kernel-devsrc \
+    "
+
+IMAGE_FEATURES += "dbg-pkgs dev-pkgs"
diff --git a/images/enea-nfv-access.bb b/images/enea-nfv-access.bb
index c6b9727..ab078bb 100644
--- a/images/enea-nfv-access.bb
+++ b/images/enea-nfv-access.bb
@@ -1,7 +1,7 @@
-DESCRIPTION = "Image for the host side of the Enea NFV Access Platform"
+DESCRIPTION = "Image for the host side of the Enea NFV Access Platform with ODM customizations"
 
 require images/enea-nfv-access-host-common.inc
 
 IMAGE_INSTALL += " \
-    packagegroup-enea-virtualization-element-odm \
+    element-odm \
     "