From 067d90d472a5aebf57a2a6ab8deb0a94995a9dc8 Mon Sep 17 00:00:00 2001 From: Adrian Dudau Date: Mon, 2 Oct 2017 13:33:16 +0200 Subject: Rename images Signed-off-by: Adrian Dudau Signed-off-by: Martin Borg --- conf/template.cn8304-sdk/conf-notes.txt | 2 +- conf/template.cn8304/conf-notes.txt | 5 ++--- conf/template.inteld1521-sdk/conf-notes.txt | 2 +- conf/template.inteld1521/conf-notes.txt | 5 ++--- conf/template.qemuarm64/conf-notes.txt | 4 ++-- conf/template.qemux86-64/conf-notes.txt | 4 ++-- images/enea-image-nfv-access-common.inc | 16 ---------------- images/enea-image-nfv-access-guest-sdk.bb | 13 ------------- images/enea-image-nfv-access-guest.bb | 9 --------- images/enea-image-nfv-access-host-common.inc | 10 ---------- images/enea-image-nfv-access-host-odm.bb | 7 ------- images/enea-image-nfv-access-host-openstack.bb | 17 ----------------- images/enea-image-nfv-access-host-sdk.bb | 18 ------------------ images/enea-image-nfv-access-host.bb | 3 --- images/enea-nfv-access-common.inc | 16 ++++++++++++++++ images/enea-nfv-access-dev.bb | 18 ++++++++++++++++++ images/enea-nfv-access-guest-dev.bb | 13 +++++++++++++ images/enea-nfv-access-guest.bb | 9 +++++++++ images/enea-nfv-access-host-common.inc | 10 ++++++++++ images/enea-nfv-access-openstack.bb | 17 +++++++++++++++++ images/enea-nfv-access.bb | 7 +++++++ 21 files changed, 100 insertions(+), 105 deletions(-) delete mode 100644 images/enea-image-nfv-access-common.inc delete mode 100644 images/enea-image-nfv-access-guest-sdk.bb delete mode 100644 images/enea-image-nfv-access-guest.bb delete mode 100644 images/enea-image-nfv-access-host-common.inc delete mode 100644 images/enea-image-nfv-access-host-odm.bb delete mode 100644 images/enea-image-nfv-access-host-openstack.bb delete mode 100644 images/enea-image-nfv-access-host-sdk.bb delete mode 100644 images/enea-image-nfv-access-host.bb create mode 100644 images/enea-nfv-access-common.inc create mode 100644 images/enea-nfv-access-dev.bb create mode 100644 images/enea-nfv-access-guest-dev.bb create mode 100644 images/enea-nfv-access-guest.bb create mode 100644 images/enea-nfv-access-host-common.inc create mode 100644 images/enea-nfv-access-openstack.bb create mode 100644 images/enea-nfv-access.bb 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-common.inc b/images/enea-image-nfv-access-common.inc deleted file mode 100644 index 043b020..0000000 --- a/images/enea-image-nfv-access-common.inc +++ /dev/null @@ -1,16 +0,0 @@ -require images/enea-image-common.inc - -IMAGE_INSTALL += " \ - packagegroup-enea-virtualization \ - kernel-modules \ - " - -IMAGE_FSTYPES = "ext4.gz tar.gz" - -inherit image_types_uboot -IMAGE_FSTYPES_append_cn8304 = " ext4.gz.u-boot" - -#keep only the archive -do_image_ext4_append() { - rm ${IMGDEPLOYDIR}/*.ext4 -} diff --git a/images/enea-image-nfv-access-guest-sdk.bb b/images/enea-image-nfv-access-guest-sdk.bb deleted file mode 100644 index 0e909b1..0000000 --- a/images/enea-image-nfv-access-guest-sdk.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION = "Image for the guest side of the Enea NFV Access Platform" - -require images/enea-image-nfv-access-common.inc - -IMAGE_INSTALL += " \ - packagegroup-enea-virtualization-guest \ - packagegroup-enea-virtualization-tools \ - kernel-devsrc \ - " - -IMAGE_FEATURES += "dbg-pkgs dev-pkgs" - -require images/build-qcow-image.inc diff --git a/images/enea-image-nfv-access-guest.bb b/images/enea-image-nfv-access-guest.bb deleted file mode 100644 index 2317e23..0000000 --- a/images/enea-image-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-image-nfv-access-common.inc - -IMAGE_INSTALL += " \ - packagegroup-enea-virtualization-guest \ - " - -require images/build-qcow-image.inc diff --git a/images/enea-image-nfv-access-host-common.inc b/images/enea-image-nfv-access-host-common.inc deleted file mode 100644 index aea42ec..0000000 --- a/images/enea-image-nfv-access-host-common.inc +++ /dev/null @@ -1,10 +0,0 @@ -require images/enea-image-nfv-access-common.inc - -IMAGE_INSTALL += " \ - packagegroup-enea-virtualization-host \ - " - -# 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-image-nfv-access-host-odm.bb b/images/enea-image-nfv-access-host-odm.bb deleted file mode 100644 index db0f4de..0000000 --- a/images/enea-image-nfv-access-host-odm.bb +++ /dev/null @@ -1,7 +0,0 @@ -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 \ - " diff --git a/images/enea-image-nfv-access-host-openstack.bb b/images/enea-image-nfv-access-host-openstack.bb deleted file mode 100644 index 3429c94..0000000 --- a/images/enea-image-nfv-access-host-openstack.bb +++ /dev/null @@ -1,17 +0,0 @@ -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 - -IMAGE_INSTALL = " \ - packagegroup-core-boot \ - packagegroup-cloud-compute \ - packagegroup-cloud-debug \ - packagegroup-cloud-extras \ - " - -IMAGE_FEATURES += "ssh-server-openssh" - -inherit openstack-base -inherit monitor - -IMAGE_ROOTFS_EXTRA_SPACE_append += "+ 3000000" diff --git a/images/enea-image-nfv-access-host-sdk.bb b/images/enea-image-nfv-access-host-sdk.bb deleted file mode 100644 index add2689..0000000 --- a/images/enea-image-nfv-access-host-sdk.bb +++ /dev/null @@ -1,18 +0,0 @@ -DESCRIPTION = "Image for the host side of the Enea NFV Access Platform" - -require images/enea-image-nfv-access-common.inc - -IMAGE_INSTALL += " \ - packagegroup-enea-virtualization-host \ - 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-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-nfv-access-common.inc b/images/enea-nfv-access-common.inc new file mode 100644 index 0000000..043b020 --- /dev/null +++ b/images/enea-nfv-access-common.inc @@ -0,0 +1,16 @@ +require images/enea-image-common.inc + +IMAGE_INSTALL += " \ + packagegroup-enea-virtualization \ + kernel-modules \ + " + +IMAGE_FSTYPES = "ext4.gz tar.gz" + +inherit image_types_uboot +IMAGE_FSTYPES_append_cn8304 = " ext4.gz.u-boot" + +#keep only the archive +do_image_ext4_append() { + rm ${IMGDEPLOYDIR}/*.ext4 +} diff --git a/images/enea-nfv-access-dev.bb b/images/enea-nfv-access-dev.bb new file mode 100644 index 0000000..7e10642 --- /dev/null +++ b/images/enea-nfv-access-dev.bb @@ -0,0 +1,18 @@ +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-guest-dev.bb b/images/enea-nfv-access-guest-dev.bb new file mode 100644 index 0000000..7e0d64b --- /dev/null +++ b/images/enea-nfv-access-guest-dev.bb @@ -0,0 +1,13 @@ +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" + +require images/build-qcow-image.inc diff --git a/images/enea-nfv-access-guest.bb b/images/enea-nfv-access-guest.bb new file mode 100644 index 0000000..772c1d8 --- /dev/null +++ b/images/enea-nfv-access-guest.bb @@ -0,0 +1,9 @@ +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 \ + " + +require images/build-qcow-image.inc diff --git a/images/enea-nfv-access-host-common.inc b/images/enea-nfv-access-host-common.inc new file mode 100644 index 0000000..c907b88 --- /dev/null +++ b/images/enea-nfv-access-host-common.inc @@ -0,0 +1,10 @@ +require images/enea-nfv-access-common.inc + +IMAGE_INSTALL += " \ + packagegroup-enea-virtualization-host \ + " + +# 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-openstack.bb b/images/enea-nfv-access-openstack.bb new file mode 100644 index 0000000..5672d60 --- /dev/null +++ b/images/enea-nfv-access-openstack.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Image for the host side of the Enea NFV Access Platform that provides Oopenstack support" + +require images/enea-nfv-access-host-common.inc + +IMAGE_INSTALL = " \ + packagegroup-core-boot \ + packagegroup-cloud-compute \ + packagegroup-cloud-debug \ + packagegroup-cloud-extras \ + " + +IMAGE_FEATURES += "ssh-server-openssh" + +inherit openstack-base +inherit monitor + +IMAGE_ROOTFS_EXTRA_SPACE_append += "+ 3000000" diff --git a/images/enea-nfv-access.bb b/images/enea-nfv-access.bb new file mode 100644 index 0000000..c6b9727 --- /dev/null +++ b/images/enea-nfv-access.bb @@ -0,0 +1,7 @@ +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 \ + " -- cgit v1.2.3-54-g00ecf