Rename images

Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
Signed-off-by: Martin Borg <martin.borg@enea.com>

14 files changed, 18 insertions, 23 deletions

diff --git a/conf/template.cn8304-sdk/conf-notes.txt b/conf/template.cn8304-sdk/conf-notes.txt
index 3dd7ea1..4baed2d 100644
--- a/conf/template.cn8304-sdk/conf-notes.txt
+++ b/conf/template.cn8304-sdk/conf-notes.txt
@@ -1,2 +1,2 @@
 Common targets are:
-    enea-image-nfv-access-host-sdk
+    enea-nfv-access-dev
diff --git a/conf/template.cn8304/conf-notes.txt b/conf/template.cn8304/conf-notes.txt
index 53ebbe6..e97942f 100644
--- a/conf/template.cn8304/conf-notes.txt
+++ b/conf/template.cn8304/conf-notes.txt
@@ -1,4 +1,3 @@
 Common targets are:
-    enea-image-nfv-access-host
-    enea-image-nfv-access-host-odm
-    enea-image-nfv-access-host-openstack
+    enea-nfv-access
+    enea-nfv-access-openstack
diff --git a/conf/template.inteld1521-sdk/conf-notes.txt b/conf/template.inteld1521-sdk/conf-notes.txt
index 3dd7ea1..4baed2d 100644
--- a/conf/template.inteld1521-sdk/conf-notes.txt
+++ b/conf/template.inteld1521-sdk/conf-notes.txt
@@ -1,2 +1,2 @@
 Common targets are:
-    enea-image-nfv-access-host-sdk
+    enea-nfv-access-dev
diff --git a/conf/template.inteld1521/conf-notes.txt b/conf/template.inteld1521/conf-notes.txt
index 53ebbe6..e97942f 100644
--- a/conf/template.inteld1521/conf-notes.txt
+++ b/conf/template.inteld1521/conf-notes.txt
@@ -1,4 +1,3 @@
 Common targets are:
-    enea-image-nfv-access-host
-    enea-image-nfv-access-host-odm
-    enea-image-nfv-access-host-openstack
+    enea-nfv-access
+    enea-nfv-access-openstack
diff --git a/conf/template.qemuarm64/conf-notes.txt b/conf/template.qemuarm64/conf-notes.txt
index 8df5560..f55d0a3 100644
--- a/conf/template.qemuarm64/conf-notes.txt
+++ b/conf/template.qemuarm64/conf-notes.txt
@@ -1,3 +1,3 @@
 Common targets are:
-    enea-image-nfv-access-guest
-    enea-image-nfv-access-guest-sdk
+    enea-nfv-access-guest
+    enea-nfv-access-guest-dev
diff --git a/conf/template.qemux86-64/conf-notes.txt b/conf/template.qemux86-64/conf-notes.txt
index 8df5560..f55d0a3 100644
--- a/conf/template.qemux86-64/conf-notes.txt
+++ b/conf/template.qemux86-64/conf-notes.txt
@@ -1,3 +1,3 @@
 Common targets are:
-    enea-image-nfv-access-guest
-    enea-image-nfv-access-guest-sdk
+    enea-nfv-access-guest
+    enea-nfv-access-guest-dev
diff --git a/images/enea-image-nfv-access-host.bb b/images/enea-image-nfv-access-host.bb
deleted file mode 100644
index 0f5faae..0000000
--- a/images/enea-image-nfv-access-host.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-DESCRIPTION = "Image for the host side of the Enea NFV Access Platform"
-
-require images/enea-image-nfv-access-host-common.inc
diff --git a/images/enea-image-nfv-access-common.inc b/images/enea-nfv-access-common.inc
index 043b020..043b020 100644
--- a/images/enea-image-nfv-access-common.inc
+++ b/images/enea-nfv-access-common.inc
diff --git a/images/enea-image-nfv-access-host-sdk.bb b/images/enea-nfv-access-dev.bb
index add2689..7e10642 100644
--- a/images/enea-image-nfv-access-host-sdk.bb
+++ b/images/enea-nfv-access-dev.bb
@@ -1,9 +1,9 @@
 DESCRIPTION = "Image for the host side of the Enea NFV Access Platform"
 
-require images/enea-image-nfv-access-common.inc
+require images/enea-nfv-access-host-common.inc
 
 IMAGE_INSTALL += " \
-    packagegroup-enea-virtualization-host \
+    packagegroup-enea-virtualization-element-odm \
     packagegroup-enea-virtualization-tools \
     kernel-devsrc \
     "
diff --git a/images/enea-image-nfv-access-guest-sdk.bb b/images/enea-nfv-access-guest-dev.bb
index 0e909b1..7e0d64b 100644
--- a/images/enea-image-nfv-access-guest-sdk.bb
+++ b/images/enea-nfv-access-guest-dev.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Image for the guest side of the Enea NFV Access Platform"
 
-require images/enea-image-nfv-access-common.inc
+require images/enea-nfv-access-common.inc
 
 IMAGE_INSTALL += " \
     packagegroup-enea-virtualization-guest \
diff --git a/images/enea-image-nfv-access-guest.bb b/images/enea-nfv-access-guest.bb
index 2317e23..772c1d8 100644
--- a/images/enea-image-nfv-access-guest.bb
+++ b/images/enea-nfv-access-guest.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Image for the guest side of the Enea NFV Access Platform"
 
-require images/enea-image-nfv-access-common.inc
+require images/enea-nfv-access-common.inc
 
 IMAGE_INSTALL += " \
     packagegroup-enea-virtualization-guest \
diff --git a/images/enea-image-nfv-access-host-common.inc b/images/enea-nfv-access-host-common.inc
index aea42ec..c907b88 100644
--- a/images/enea-image-nfv-access-host-common.inc
+++ b/images/enea-nfv-access-host-common.inc
@@ -1,4 +1,4 @@
-require images/enea-image-nfv-access-common.inc
+require images/enea-nfv-access-common.inc
 
 IMAGE_INSTALL += " \
     packagegroup-enea-virtualization-host \
diff --git a/images/enea-image-nfv-access-host-openstack.bb b/images/enea-nfv-access-openstack.bb
index 3429c94..5672d60 100644
--- a/images/enea-image-nfv-access-host-openstack.bb
+++ b/images/enea-nfv-access-openstack.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Image for the host side of the Enea NFV Access Platform that provides Oopenstack support"
 
-require images/enea-image-nfv-access-host-common.inc
+require images/enea-nfv-access-host-common.inc
 
 IMAGE_INSTALL = " \
     packagegroup-core-boot \
diff --git a/images/enea-image-nfv-access-host-odm.bb b/images/enea-nfv-access.bb
index db0f4de..c6b9727 100644
--- a/images/enea-image-nfv-access-host-odm.bb
+++ b/images/enea-nfv-access.bb
@@ -1,6 +1,6 @@
-DESCRIPTION = "Image for the host side of the Enea NFV Access Platform that provides ODM support"
+DESCRIPTION = "Image for the host side of the Enea NFV Access Platform"
 
-require enea-image-nfv-access-host.bb
+require images/enea-nfv-access-host-common.inc
 
 IMAGE_INSTALL += " \
     packagegroup-enea-virtualization-element-odm \