Update layer dependencies to account for new layer names

Change-Id: I34619d8b8170a17a3281dc7e8162e88ca18d5c7d
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>

6 files changed, 19 insertions, 19 deletions

diff --git a/README b/README
index 1c3c145..a43ff27 100644
--- a/README
+++ b/README
@@ -1,8 +1,8 @@
 meta-el-nfv-access
 ===================================================================
 
-This layer contains distro customizations specific to the Enea Linux
-NFV Access platform releases.
+This layer contains distro customizations specific to the Enea NFV
+Access platform releases.
 
 Dependencies
 ============
@@ -12,11 +12,11 @@ This layer depends on:
   URI: git://git.yoctoproject.org/poky
   branch: rocko
 
-  URI: git://git.enea.com/linux/meta-el-common
-  branch: rocko
+  URI: git://git.enea.com/linux/meta-nfv-access-common
+  branch: master
 
   URI: git://git.enea.com/linux/meta-enea-virtualization
-  branch: rocko
+  branch: master
 
 
 
@@ -58,7 +58,7 @@ other layers needed. e.g.:
   BBLAYERS ?= " \
       /path/to/yocto/meta \
       /path/to/yocto/meta-poky \
-      /path/to/yocto/meta-el-common \
+      /path/to/yocto/meta-nfv-access-common \
       /path/to/yocto/meta-enea-virtualization \
       /path/to/yocto/meta-el-nfv-access \
       "
diff --git a/conf/layer.conf b/conf/layer.conf
index acd26f0..7fec7c8 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -10,4 +10,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
 BBFILE_COLLECTIONS += "el-nfv-access"
 BBFILE_PATTERN_el-nfv-access = "^${LAYERDIR}/"
 BBFILE_PRIORITY_el-nfv-access = "7"
-LAYERDEPENDS_el-nfv-access = "el-common enea-virtualization"
+LAYERDEPENDS_el-nfv-access = "nfv-access-common enea-virtualization"
diff --git a/conf/template.atom-c3000/bblayers.conf.sample b/conf/template.atom-c3000/bblayers.conf.sample
index d8b8fc3..71c77cc 100644
--- a/conf/template.atom-c3000/bblayers.conf.sample
+++ b/conf/template.atom-c3000/bblayers.conf.sample
@@ -10,11 +10,11 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-poky \
   ##OEROOT##/meta-intel \
   ##OEROOT##/meta-dpdk \
-  ##OEROOT##/meta-enea-bsp-common \
-  ##OEROOT##/meta-enea-bsp-x86 \
+  ##OEROOT##/meta-nfv-access-bsp-common \
+  ##OEROOT##/meta-nfv-access-bsp-x86 \
   ##OEROOT##/meta-virtualization \
   ##OEROOT##/meta-enea-virtualization \
-  ##OEROOT##/meta-el-common \
+  ##OEROOT##/meta-nfv-access-common \
   ##OEROOT##/meta-el-nfv-access \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
diff --git a/conf/template.qemux86-64-esdk/bblayers.conf.sample b/conf/template.qemux86-64-esdk/bblayers.conf.sample
index 6ebc094..3a39c06 100644
--- a/conf/template.qemux86-64-esdk/bblayers.conf.sample
+++ b/conf/template.qemux86-64-esdk/bblayers.conf.sample
@@ -9,10 +9,10 @@ BBLAYERS ?= " \
   ##OEROOT##/meta \
   ##OEROOT##/meta-poky \
   ##OEROOT##/meta-intel \
-  ##OEROOT##/meta-enea-bsp-common \
-  ##OEROOT##/meta-enea-bsp-x86 \
+  ##OEROOT##/meta-nfv-access-bsp-common \
+  ##OEROOT##/meta-nfv-access-bsp-x86 \
   ##OEROOT##/meta-virtualization \
-  ##OEROOT##/meta-el-common \
+  ##OEROOT##/meta-nfv-access-common \
   ##OEROOT##/meta-el-nfv-access \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
diff --git a/conf/template.qemux86-64/bblayers.conf.sample b/conf/template.qemux86-64/bblayers.conf.sample
index ab8f222..ea5510a 100644
--- a/conf/template.qemux86-64/bblayers.conf.sample
+++ b/conf/template.qemux86-64/bblayers.conf.sample
@@ -10,11 +10,11 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-poky \
   ##OEROOT##/meta-intel \
   ##OEROOT##/meta-dpdk \
-  ##OEROOT##/meta-enea-bsp-common \
-  ##OEROOT##/meta-enea-bsp-x86 \
+  ##OEROOT##/meta-nfv-access-bsp-common \
+  ##OEROOT##/meta-nfv-access-bsp-x86 \
   ##OEROOT##/meta-virtualization \
   ##OEROOT##/meta-enea-virtualization \
-  ##OEROOT##/meta-el-common \
+  ##OEROOT##/meta-nfv-access-common \
   ##OEROOT##/meta-el-nfv-access \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \
diff --git a/conf/template.xeon-d/bblayers.conf.sample b/conf/template.xeon-d/bblayers.conf.sample
index d8b8fc3..71c77cc 100644
--- a/conf/template.xeon-d/bblayers.conf.sample
+++ b/conf/template.xeon-d/bblayers.conf.sample
@@ -10,11 +10,11 @@ BBLAYERS ?= " \
   ##OEROOT##/meta-poky \
   ##OEROOT##/meta-intel \
   ##OEROOT##/meta-dpdk \
-  ##OEROOT##/meta-enea-bsp-common \
-  ##OEROOT##/meta-enea-bsp-x86 \
+  ##OEROOT##/meta-nfv-access-bsp-common \
+  ##OEROOT##/meta-nfv-access-bsp-x86 \
   ##OEROOT##/meta-virtualization \
   ##OEROOT##/meta-enea-virtualization \
-  ##OEROOT##/meta-el-common \
+  ##OEROOT##/meta-nfv-access-common \
   ##OEROOT##/meta-el-nfv-access \
   ##OEROOT##/meta-openembedded/meta-oe \
   ##OEROOT##/meta-openembedded/meta-networking \