aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2018-10-08 11:07:46 +0800
committerBruce Ashfield <bruce.ashfield@windriver.com>2018-10-09 23:22:57 -0400
commit702fdd7945395f5cc3f9047cbb85f03173befad4 (patch)
tree457ace2c8e4140ccd53a85dcd29b7304c614c653
parentabd8c6ad4b6786e2bb4014115a0bf5a14449c875 (diff)
downloadmeta-cloud-services-702fdd7945395f5cc3f9047cbb85f03173befad4.tar.gz
meta-cloud-services-702fdd7945395f5cc3f9047cbb85f03173befad4.tar.bz2
meta-cloud-services-702fdd7945395f5cc3f9047cbb85f03173befad4.zip
*/layer.conf: Update LAYERDEPENDS
The ruby layer is no longer in meta-openembedded, remove references to that from the README. Implement the LAYERDEPENDS for each of the layers so that the layerindex will populate properly. Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--meta-openstack-aio-deploy/README1
-rw-r--r--meta-openstack-aio-deploy/conf/layer.conf9
-rw-r--r--meta-openstack-compute-deploy/README1
-rw-r--r--meta-openstack-compute-deploy/conf/layer.conf9
-rw-r--r--meta-openstack-compute-test-config/README1
-rw-r--r--meta-openstack-compute-test-config/conf/layer.conf4
-rw-r--r--meta-openstack-controller-deploy/README1
-rw-r--r--meta-openstack-controller-deploy/conf/layer.conf9
-rw-r--r--meta-openstack-controller-test-config/README1
-rw-r--r--meta-openstack-controller-test-config/conf/layer.conf4
-rw-r--r--meta-openstack-qemu/README1
-rw-r--r--meta-openstack-qemu/conf/layer.conf9
-rw-r--r--meta-openstack-swift-deploy/README1
-rw-r--r--meta-openstack-swift-deploy/conf/layer.conf9
-rw-r--r--meta-openstack/conf/layer.conf11
15 files changed, 64 insertions, 7 deletions
diff --git a/meta-openstack-aio-deploy/README b/meta-openstack-aio-deploy/README
index 3603739..19a1bf5 100644
--- a/meta-openstack-aio-deploy/README
+++ b/meta-openstack-aio-deploy/README
@@ -19,7 +19,6 @@ patches: 0001-python-sqlalchemy-update-to-0.7.9.patch
revision: HEAD
layers: meta-oe
meta-networking
- meta-ruby
URI: git://git.yoctoproject.org/meta-virtualization
branch: master
diff --git a/meta-openstack-aio-deploy/conf/layer.conf b/meta-openstack-aio-deploy/conf/layer.conf
index 6d256c4..46622a6 100644
--- a/meta-openstack-aio-deploy/conf/layer.conf
+++ b/meta-openstack-aio-deploy/conf/layer.conf
@@ -8,3 +8,12 @@ BBFILE_COLLECTIONS += "openstack-aio-deploy-layer"
BBFILE_PATTERN_openstack-aio-deploy-layer := "^${LAYERDIR}/"
BBFILE_PRIORITY_openstack-aio-deploy-layer = "6"
LAYERSERIES_COMPAT_openstack-aio-deploy-layer = "sumo"
+
+LAYERDEPENDS_openstack-aio-deploy-layer = " \
+ core \
+ cloud-services-layer \
+ openembedded-layer \
+ networking-layer \
+ virtualization-layer \
+ openstack-layer \
+ "
diff --git a/meta-openstack-compute-deploy/README b/meta-openstack-compute-deploy/README
index 12c2bae..1328598 100644
--- a/meta-openstack-compute-deploy/README
+++ b/meta-openstack-compute-deploy/README
@@ -19,7 +19,6 @@ patches: 0001-python-sqlalchemy-update-to-0.7.9.patch
revision: HEAD
layers: meta-oe
meta-networking
- meta-ruby
URI: git://git.yoctoproject.org/meta-virtualization
branch: master
diff --git a/meta-openstack-compute-deploy/conf/layer.conf b/meta-openstack-compute-deploy/conf/layer.conf
index 91a83e6..e2192a1 100644
--- a/meta-openstack-compute-deploy/conf/layer.conf
+++ b/meta-openstack-compute-deploy/conf/layer.conf
@@ -8,3 +8,12 @@ BBFILE_COLLECTIONS += "openstack-compute-deploy-layer"
BBFILE_PATTERN_openstack-compute-deploy-layer := "^${LAYERDIR}/"
BBFILE_PRIORITY_openstack-compute-deploy-layer = "6"
LAYERSERIES_COMPAT_openstack-compute-deploy-layer = "sumo"
+
+LAYERDEPENDS_openstack-compute-deploy-layer = " \
+ core \
+ cloud-services-layer \
+ openembedded-layer \
+ networking-layer \
+ virtualization-layer \
+ openstack-layer \
+ "
diff --git a/meta-openstack-compute-test-config/README b/meta-openstack-compute-test-config/README
index 9e9b11f..e504f0f 100644
--- a/meta-openstack-compute-test-config/README
+++ b/meta-openstack-compute-test-config/README
@@ -20,7 +20,6 @@ patches: 0001-python-sqlalchemy-update-to-0.7.9.patch
revision: HEAD
layers: meta-oe
meta-networking
- meta-ruby
URI: git://git.yoctoproject.org/meta-virtualization
branch: master
diff --git a/meta-openstack-compute-test-config/conf/layer.conf b/meta-openstack-compute-test-config/conf/layer.conf
index bc070d8..7fca615 100644
--- a/meta-openstack-compute-test-config/conf/layer.conf
+++ b/meta-openstack-compute-test-config/conf/layer.conf
@@ -9,3 +9,7 @@ BBFILE_PATTERN_openstack-compute-test-config-layer := "^${LAYERDIR}/"
# We want this layer to have higher priority than any other meta-openstack layers
BBFILE_PRIORITY_openstack-compute-test-config-layer = "100"
LAYERSERIES_COMPAT_openstack-compute-test-config-layer = "sumo"
+
+LAYERDEPENDS_openstack-compute-test-config-layer = " \
+ openstack-compute-deploy-layer \
+ "
diff --git a/meta-openstack-controller-deploy/README b/meta-openstack-controller-deploy/README
index 0e31c17..d4172a7 100644
--- a/meta-openstack-controller-deploy/README
+++ b/meta-openstack-controller-deploy/README
@@ -19,7 +19,6 @@ patches: 0001-python-sqlalchemy-update-to-0.7.9.patch
revision: HEAD
layers: meta-oe
meta-networking
- meta-ruby
URI: git://git.yoctoproject.org/meta-virtualization
branch: master
diff --git a/meta-openstack-controller-deploy/conf/layer.conf b/meta-openstack-controller-deploy/conf/layer.conf
index a2c9d16..73ac493 100644
--- a/meta-openstack-controller-deploy/conf/layer.conf
+++ b/meta-openstack-controller-deploy/conf/layer.conf
@@ -8,3 +8,12 @@ BBFILE_COLLECTIONS += "openstack-controller-deploy-layer"
BBFILE_PATTERN_openstack-controller-deploy-layer := "^${LAYERDIR}/"
BBFILE_PRIORITY_openstack-controller-deploy-layer = "6"
LAYERSERIES_COMPAT_openstack-controller-deploy-layer = "sumo"
+
+LAYERDEPENDS_openstack-controller-deploy-layer = " \
+ core \
+ cloud-services-layer \
+ openembedded-layer \
+ networking-layer \
+ virtualization-layer \
+ openstack-layer \
+"
diff --git a/meta-openstack-controller-test-config/README b/meta-openstack-controller-test-config/README
index 4217997..471b2e8 100644
--- a/meta-openstack-controller-test-config/README
+++ b/meta-openstack-controller-test-config/README
@@ -20,7 +20,6 @@ patches: 0001-python-sqlalchemy-update-to-0.7.9.patch
revision: HEAD
layers: meta-oe
meta-networking
- meta-ruby
URI: git://git.yoctoproject.org/meta-virtualization
branch: master
diff --git a/meta-openstack-controller-test-config/conf/layer.conf b/meta-openstack-controller-test-config/conf/layer.conf
index dcae15d..3734375 100644
--- a/meta-openstack-controller-test-config/conf/layer.conf
+++ b/meta-openstack-controller-test-config/conf/layer.conf
@@ -9,3 +9,7 @@ BBFILE_PATTERN_openstack-controller-test-config-layer := "^${LAYERDIR}/"
# We want this layer to have higher priority than any other meta-openstack layers
BBFILE_PRIORITY_openstack-controller-test-config-layer = "100"
LAYERSERIES_COMPAT_openstack-controller-test-config-layer = "sumo"
+
+LAYERDEPENDS_openstack-controller-test-config-layer = " \
+ openstack-controller-deploy-layer \
+ "
diff --git a/meta-openstack-qemu/README b/meta-openstack-qemu/README
index 63ef70a..81ce86b 100644
--- a/meta-openstack-qemu/README
+++ b/meta-openstack-qemu/README
@@ -19,7 +19,6 @@ patches: 0001-python-sqlalchemy-update-to-0.7.9.patch
revision: HEAD
layers: meta-oe
meta-networking
- meta-ruby
URI: git://git.yoctoproject.org/meta-virtualization
branch: master
diff --git a/meta-openstack-qemu/conf/layer.conf b/meta-openstack-qemu/conf/layer.conf
index b6d45ba..d3ddf82 100644
--- a/meta-openstack-qemu/conf/layer.conf
+++ b/meta-openstack-qemu/conf/layer.conf
@@ -8,3 +8,12 @@ BBFILE_COLLECTIONS += "openstack-qemu-layer"
BBFILE_PATTERN_openstack-qemu-layer := "^${LAYERDIR}/"
BBFILE_PRIORITY_openstack-qemu-layer = "6"
LAYERSERIES_COMPAT_openstack-qemu-layer = "sumo"
+
+LAYERDEPENDS_openstack-qemu-layer = " \
+ core \
+ cloud-services-layer \
+ openembedded-layer \
+ networking-layer \
+ virtualization-layer \
+ openstack-layer \
+ "
diff --git a/meta-openstack-swift-deploy/README b/meta-openstack-swift-deploy/README
index 9c8acb3..07ba5f9 100644
--- a/meta-openstack-swift-deploy/README
+++ b/meta-openstack-swift-deploy/README
@@ -19,7 +19,6 @@ patches: 0001-python-sqlalchemy-update-to-0.7.9.patch
revision: HEAD
layers: meta-oe
meta-networking
- meta-ruby
URI: git://git.yoctoproject.org/meta-virtualization
branch: master
diff --git a/meta-openstack-swift-deploy/conf/layer.conf b/meta-openstack-swift-deploy/conf/layer.conf
index d021fcc..12108ef 100644
--- a/meta-openstack-swift-deploy/conf/layer.conf
+++ b/meta-openstack-swift-deploy/conf/layer.conf
@@ -8,3 +8,12 @@ BBFILE_COLLECTIONS += "openstack-swift-deploy-layer"
BBFILE_PATTERN_openstack-swift-deploy-layer := "^${LAYERDIR}/"
BBFILE_PRIORITY_openstack-swift-deploy-layer = "6"
LAYERSERIES_COMPAT_openstack-swift-deploy-layer = "sumo"
+
+LAYERDEPENDS_openstack-swift-deploy-layer = " \
+ core \
+ cloud-services-layer \
+ openembedded-layer \
+ networking-layer \
+ virtualization-layer \
+ openstack-layer \
+ "
diff --git a/meta-openstack/conf/layer.conf b/meta-openstack/conf/layer.conf
index ac4f055..0370c81 100644
--- a/meta-openstack/conf/layer.conf
+++ b/meta-openstack/conf/layer.conf
@@ -10,6 +10,17 @@ BBFILE_PRIORITY_openstack-layer = "5"
LAYERSERIES_COMPAT_openstack-layer = "sumo"
BB_DANGLINGAPPENDS_WARNONLY ?= "true"
+LAYERDEPENDS_openstack-layer = " \
+ core \
+ cloud-services-layer \
+ openembedded-layer \
+ networking-layer \
+ filesystems-layer \
+ webserver \
+ meta-python \
+ virtualization-layer \
+ "
+
# pre 0.4.0 greenlet versions segfault python
PREFERRED_VERSION_python-greenlet = "0.4.5"
PREFERRED_VERSION_python-sqlalchemy = "1.0.8"