From 98d8b9dd39fbc2cd15518ceed2f3c1f3994a091d Mon Sep 17 00:00:00 2001 From: Adrian Dudau Date: Wed, 9 May 2018 14:52:48 +0200 Subject: Restructure images We will have two main host images now: enea-nfv-access (which includes element-odm) and enea-nfv-access-edgelink-netconf (which includes element-vcpe) We also have two images used to build the sdks: enea-nfv-access-sdk (based on enea-nfv-access) enea-nfv-access-esdk (based on enea-image-common from meta-el-common) For the gues side, we only have one image used instead of the old guest image: enea-nfv-access-vnf All the other images are getting dropped. Signed-off-by: Adrian Dudau Signed-off-by: Martin Borg --- images/enea-nfv-access-dev.bb | 18 ------------------ images/enea-nfv-access-edgelink-netconf.bb | 8 ++++++++ images/enea-nfv-access-guest-dev.bb | 13 ------------- images/enea-nfv-access-guest.bb | 9 --------- images/enea-nfv-access-odm.bb | 9 --------- images/enea-nfv-access-sdk.bb | 10 ++++++++++ images/enea-nfv-access.bb | 4 ++-- 7 files changed, 20 insertions(+), 51 deletions(-) delete mode 100644 images/enea-nfv-access-dev.bb create mode 100644 images/enea-nfv-access-edgelink-netconf.bb delete mode 100644 images/enea-nfv-access-guest-dev.bb delete mode 100644 images/enea-nfv-access-guest.bb delete mode 100644 images/enea-nfv-access-odm.bb create mode 100644 images/enea-nfv-access-sdk.bb 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-edgelink-netconf.bb b/images/enea-nfv-access-edgelink-netconf.bb new file mode 100644 index 0000000..cfaffb7 --- /dev/null +++ b/images/enea-nfv-access-edgelink-netconf.bb @@ -0,0 +1,8 @@ +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 += " \ + 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-odm.bb b/images/enea-nfv-access-odm.bb deleted file mode 100644 index 9c65236..0000000 --- a/images/enea-nfv-access-odm.bb +++ /dev/null @@ -1,9 +0,0 @@ -DESCRIPTION = "Image for the host side of the Enea NFV Access Platform with ODM customizations" -LICENSE="" -require images/enea-nfv-access-host-common.inc - -IMAGE_INSTALL += " \ - packagegroup-enea-virtualization-element-odm \ - element-odm \ - nfv-init-host \ - " 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 \ " -- cgit v1.2.3-54-g00ecf