diff options
18 files changed, 35 insertions, 30 deletions
diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..39fc438 --- /dev/null +++ b/.gitreview | |||
@@ -0,0 +1,5 @@ | |||
1 | [gerrit] | ||
2 | host=gerrit.enea.se | ||
3 | port=29418 | ||
4 | project=linux/meta-el-nfv-access.git | ||
5 | track=1 | ||
diff --git a/conf/distro/eneanfvaccess.conf b/conf/distro/eneanfvaccess.conf index 3dcec36..070bbb8 100644 --- a/conf/distro/eneanfvaccess.conf +++ b/conf/distro/eneanfvaccess.conf | |||
@@ -1,7 +1,7 @@ | |||
1 | require conf/distro/enea.conf | 1 | require conf/distro/enea.conf |
2 | 2 | ||
3 | DISTRO_NAME = "Enea NFV Access" | 3 | DISTRO_NAME = "Enea Edge Runtime" |
4 | DISTRO_VERSION_MAJOR ??= "2.4" | 4 | DISTRO_VERSION_MAJOR ??= "2.5" |
5 | DISTRO_VERSION_MINOR ??= ".0" | 5 | DISTRO_VERSION_MINOR ??= ".0" |
6 | DISTRO_VERSION = "${DISTRO_VERSION_MAJOR}${DISTRO_VERSION_MINOR}" | 6 | DISTRO_VERSION = "${DISTRO_VERSION_MAJOR}${DISTRO_VERSION_MINOR}" |
7 | 7 | ||
diff --git a/conf/template.atom-c3000-debug/conf-notes.txt b/conf/template.atom-c3000-debug/conf-notes.txt index 1c1c026..d4da82b 100644 --- a/conf/template.atom-c3000-debug/conf-notes.txt +++ b/conf/template.atom-c3000-debug/conf-notes.txt | |||
@@ -1,2 +1,2 @@ | |||
1 | Common targets are: | 1 | Common targets are: |
2 | enea-nfv-access-debug | 2 | enea-edge-runtime-debug |
diff --git a/conf/template.atom-c3000/conf-notes.txt b/conf/template.atom-c3000/conf-notes.txt index ebd6162..580c5c9 100644 --- a/conf/template.atom-c3000/conf-notes.txt +++ b/conf/template.atom-c3000/conf-notes.txt | |||
@@ -1,2 +1,2 @@ | |||
1 | Common targets are: | 1 | Common targets are: |
2 | enea-nfv-access | 2 | enea-edge-runtime |
diff --git a/conf/template.qemux86-64-esdk/conf-notes.txt b/conf/template.qemux86-64-esdk/conf-notes.txt index e939ec6..14d7575 100644 --- a/conf/template.qemux86-64-esdk/conf-notes.txt +++ b/conf/template.qemux86-64-esdk/conf-notes.txt | |||
@@ -1,2 +1,2 @@ | |||
1 | Common targets are: | 1 | Common targets are: |
2 | enea-nfv-access-esdk | 2 | enea-edge-runtime-esdk |
diff --git a/conf/template.qemux86-64/conf-notes.txt b/conf/template.qemux86-64/conf-notes.txt index e55e538..2b65747 100644 --- a/conf/template.qemux86-64/conf-notes.txt +++ b/conf/template.qemux86-64/conf-notes.txt | |||
@@ -1,2 +1,2 @@ | |||
1 | Common targets are: | 1 | Common targets are: |
2 | enea-nfv-access-vnf | 2 | enea-edge-vnf |
diff --git a/conf/template.xeon-d-debug/conf-notes.txt b/conf/template.xeon-d-debug/conf-notes.txt index 1c1c026..d4da82b 100644 --- a/conf/template.xeon-d-debug/conf-notes.txt +++ b/conf/template.xeon-d-debug/conf-notes.txt | |||
@@ -1,2 +1,2 @@ | |||
1 | Common targets are: | 1 | Common targets are: |
2 | enea-nfv-access-debug | 2 | enea-edge-runtime-debug |
diff --git a/conf/template.xeon-d/conf-notes.txt b/conf/template.xeon-d/conf-notes.txt index ebd6162..580c5c9 100644 --- a/conf/template.xeon-d/conf-notes.txt +++ b/conf/template.xeon-d/conf-notes.txt | |||
@@ -1,2 +1,2 @@ | |||
1 | Common targets are: | 1 | Common targets are: |
2 | enea-nfv-access | 2 | enea-edge-runtime |
diff --git a/images/enea-nfv-access-common.inc b/images/enea-edge-common.inc index b174064..b174064 100644 --- a/images/enea-nfv-access-common.inc +++ b/images/enea-edge-common.inc | |||
diff --git a/images/enea-nfv-access-host-common.inc b/images/enea-edge-host-common.inc index a8c984f..3df6cb9 100644 --- a/images/enea-nfv-access-host-common.inc +++ b/images/enea-edge-host-common.inc | |||
@@ -2,7 +2,7 @@ IMAGE_FSTYPES += "hddimg" | |||
2 | IMAGE_FSTYPES_remove = "wic" | 2 | IMAGE_FSTYPES_remove = "wic" |
3 | 3 | ||
4 | REQUIRE_FILES = " \ | 4 | REQUIRE_FILES = " \ |
5 | images/enea-nfv-access-common.inc \ | 5 | images/enea-edge-common.inc \ |
6 | " | 6 | " |
7 | REQUIRE_FILES_append_df-efi-secure-boot = " \ | 7 | REQUIRE_FILES_append_df-efi-secure-boot = " \ |
8 | classes/override_live-vm-common.inc \ | 8 | classes/override_live-vm-common.inc \ |
diff --git a/images/enea-edge-runtime-debug.bb b/images/enea-edge-runtime-debug.bb new file mode 100644 index 0000000..4736f24 --- /dev/null +++ b/images/enea-edge-runtime-debug.bb | |||
@@ -0,0 +1,9 @@ | |||
1 | DESCRIPTION = "Image for the host side of the Enea Edge Runtime with ODM and NETCONF Edgelink customizations" | ||
2 | |||
3 | require images/enea-edge-host-common.inc | ||
4 | |||
5 | IMAGE_INSTALL += " \ | ||
6 | element-vcpe \ | ||
7 | gdbserver \ | ||
8 | oprofile \ | ||
9 | " | ||
diff --git a/images/enea-nfv-access-esdk.bb b/images/enea-edge-runtime-esdk.bb index d424ef6..d424ef6 100644 --- a/images/enea-nfv-access-esdk.bb +++ b/images/enea-edge-runtime-esdk.bb | |||
diff --git a/images/enea-nfv-access-sdk.bb b/images/enea-edge-runtime-sdk.bb index a957add..c6a15b4 100644 --- a/images/enea-nfv-access-sdk.bb +++ b/images/enea-edge-runtime-sdk.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | DESCRIPTION = "Image for building the SDK for the host side of the Enea NFV Access Platform with ODM customizations" | 1 | DESCRIPTION = "Image for building the SDK for the host side of the Enea Edge Runtime with ODM customizations" |
2 | 2 | ||
3 | require images/enea-nfv-access-host-common.inc | 3 | require images/enea-edge-host-common.inc |
4 | 4 | ||
5 | IMAGE_INSTALL += " \ | 5 | IMAGE_INSTALL += " \ |
6 | element-odm-sdk \ | 6 | element-odm-sdk \ |
diff --git a/images/enea-edge-runtime.bb b/images/enea-edge-runtime.bb new file mode 100644 index 0000000..5071619 --- /dev/null +++ b/images/enea-edge-runtime.bb | |||
@@ -0,0 +1,7 @@ | |||
1 | DESCRIPTION = "Image for the host side of the Enea Edge Runtime with ODM and NETCONF Edgelink customizations" | ||
2 | |||
3 | require images/enea-edge-host-common.inc | ||
4 | |||
5 | IMAGE_INSTALL += " \ | ||
6 | element-vcpe \ | ||
7 | " | ||
diff --git a/images/enea-nfv-access-vnf.bb b/images/enea-edge-vnf.bb index d7b810b..5d2365b 100644 --- a/images/enea-nfv-access-vnf.bb +++ b/images/enea-edge-vnf.bb | |||
@@ -1,9 +1,9 @@ | |||
1 | DESCRIPTION = "VNF image of the Enea NFV Access Platform, includes kernel, rootfs and boot parameters" | 1 | DESCRIPTION = "VNF image of the Enea Edge Runtime, includes kernel, rootfs and boot parameters" |
2 | 2 | ||
3 | require images/enea-nfv-access-common.inc | 3 | require images/enea-edge-common.inc |
4 | 4 | ||
5 | IMAGE_FSTYPES += "wic.qcow2" | 5 | IMAGE_FSTYPES += "wic.qcow2" |
6 | WKS_FILE = "enea-nfv-access-vnf-qemux86-64.wks" | 6 | WKS_FILE = "enea-edge-vnf-qemux86-64.wks" |
7 | 7 | ||
8 | CLOUDINITPKGS = "cloud-init util-linux-blkid" | 8 | CLOUDINITPKGS = "cloud-init util-linux-blkid" |
9 | 9 | ||
diff --git a/images/enea-nfv-access-debug.bb b/images/enea-nfv-access-debug.bb deleted file mode 100644 index 63a2322..0000000 --- a/images/enea-nfv-access-debug.bb +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | DESCRIPTION = "Image for the host side of the Enea NFV Access Platform with ODM and NETCONF Edgelink customizations" | ||
2 | |||
3 | require images/enea-nfv-access-host-common.inc | ||
4 | |||
5 | IMAGE_INSTALL += " \ | ||
6 | element-vcpe \ | ||
7 | gdbserver \ | ||
8 | oprofile \ | ||
9 | " | ||
diff --git a/images/enea-nfv-access.bb b/images/enea-nfv-access.bb deleted file mode 100644 index 9311992..0000000 --- a/images/enea-nfv-access.bb +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | DESCRIPTION = "Image for the host side of the Enea NFV Access Platform with ODM and NETCONF Edgelink customizations" | ||
2 | |||
3 | require images/enea-nfv-access-host-common.inc | ||
4 | |||
5 | IMAGE_INSTALL += " \ | ||
6 | element-vcpe \ | ||
7 | " | ||
diff --git a/scripts/lib/wic/canned-wks/enea-nfv-access-vnf-qemux86-64.wks b/scripts/lib/wic/canned-wks/enea-edge-vnf-qemux86-64.wks index 89c8e4d..89c8e4d 100644 --- a/scripts/lib/wic/canned-wks/enea-nfv-access-vnf-qemux86-64.wks +++ b/scripts/lib/wic/canned-wks/enea-edge-vnf-qemux86-64.wks | |||