diff options
| author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2021-06-28 12:10:47 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2021-06-28 12:11:18 +0200 |
| commit | 7ede3bf0c747d741994e85230e8d9e529b33c9ab (patch) | |
| tree | 74cd59ad7d9104d7442fdc6b9ba1ee8061dbefa1 /conf | |
| parent | b0b7aa09e307af9678a94bdf27a310a326b9034b (diff) | |
| parent | e73962113957e3c83792e3273a071bec9ade6b38 (diff) | |
| download | meta-el-nfv-access-7ede3bf0c747d741994e85230e8d9e529b33c9ab.tar.gz | |
Merge branch 'develop'
Change-Id: I3dbb828abdc877f343ee2cc1d86cfa714593f918
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/distro/eneanfvaccess.conf | 4 | ||||
| -rw-r--r-- | conf/template.atom-c3000-debug/conf-notes.txt | 2 | ||||
| -rw-r--r-- | conf/template.atom-c3000/conf-notes.txt | 2 | ||||
| -rw-r--r-- | conf/template.qemux86-64-esdk/conf-notes.txt | 2 | ||||
| -rw-r--r-- | conf/template.qemux86-64/conf-notes.txt | 2 | ||||
| -rw-r--r-- | conf/template.xeon-d-debug/conf-notes.txt | 2 | ||||
| -rw-r--r-- | conf/template.xeon-d/conf-notes.txt | 2 |
7 files changed, 8 insertions, 8 deletions
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 |