diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2018-10-08 11:07:46 +0800 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2018-10-09 23:22:57 -0400 |
commit | 702fdd7945395f5cc3f9047cbb85f03173befad4 (patch) | |
tree | 457ace2c8e4140ccd53a85dcd29b7304c614c653 | |
parent | abd8c6ad4b6786e2bb4014115a0bf5a14449c875 (diff) | |
download | meta-cloud-services-702fdd7945395f5cc3f9047cbb85f03173befad4.tar.gz |
*/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/README | 1 | ||||
-rw-r--r-- | meta-openstack-aio-deploy/conf/layer.conf | 9 | ||||
-rw-r--r-- | meta-openstack-compute-deploy/README | 1 | ||||
-rw-r--r-- | meta-openstack-compute-deploy/conf/layer.conf | 9 | ||||
-rw-r--r-- | meta-openstack-compute-test-config/README | 1 | ||||
-rw-r--r-- | meta-openstack-compute-test-config/conf/layer.conf | 4 | ||||
-rw-r--r-- | meta-openstack-controller-deploy/README | 1 | ||||
-rw-r--r-- | meta-openstack-controller-deploy/conf/layer.conf | 9 | ||||
-rw-r--r-- | meta-openstack-controller-test-config/README | 1 | ||||
-rw-r--r-- | meta-openstack-controller-test-config/conf/layer.conf | 4 | ||||
-rw-r--r-- | meta-openstack-qemu/README | 1 | ||||
-rw-r--r-- | meta-openstack-qemu/conf/layer.conf | 9 | ||||
-rw-r--r-- | meta-openstack-swift-deploy/README | 1 | ||||
-rw-r--r-- | meta-openstack-swift-deploy/conf/layer.conf | 9 | ||||
-rw-r--r-- | meta-openstack/conf/layer.conf | 11 |
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 | |||
19 | revision: HEAD | 19 | revision: HEAD |
20 | layers: meta-oe | 20 | layers: meta-oe |
21 | meta-networking | 21 | meta-networking |
22 | meta-ruby | ||
23 | 22 | ||
24 | URI: git://git.yoctoproject.org/meta-virtualization | 23 | URI: git://git.yoctoproject.org/meta-virtualization |
25 | branch: master | 24 | 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" | |||
8 | BBFILE_PATTERN_openstack-aio-deploy-layer := "^${LAYERDIR}/" | 8 | BBFILE_PATTERN_openstack-aio-deploy-layer := "^${LAYERDIR}/" |
9 | BBFILE_PRIORITY_openstack-aio-deploy-layer = "6" | 9 | BBFILE_PRIORITY_openstack-aio-deploy-layer = "6" |
10 | LAYERSERIES_COMPAT_openstack-aio-deploy-layer = "sumo" | 10 | LAYERSERIES_COMPAT_openstack-aio-deploy-layer = "sumo" |
11 | |||
12 | LAYERDEPENDS_openstack-aio-deploy-layer = " \ | ||
13 | core \ | ||
14 | cloud-services-layer \ | ||
15 | openembedded-layer \ | ||
16 | networking-layer \ | ||
17 | virtualization-layer \ | ||
18 | openstack-layer \ | ||
19 | " | ||
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 | |||
19 | revision: HEAD | 19 | revision: HEAD |
20 | layers: meta-oe | 20 | layers: meta-oe |
21 | meta-networking | 21 | meta-networking |
22 | meta-ruby | ||
23 | 22 | ||
24 | URI: git://git.yoctoproject.org/meta-virtualization | 23 | URI: git://git.yoctoproject.org/meta-virtualization |
25 | branch: master | 24 | 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" | |||
8 | BBFILE_PATTERN_openstack-compute-deploy-layer := "^${LAYERDIR}/" | 8 | BBFILE_PATTERN_openstack-compute-deploy-layer := "^${LAYERDIR}/" |
9 | BBFILE_PRIORITY_openstack-compute-deploy-layer = "6" | 9 | BBFILE_PRIORITY_openstack-compute-deploy-layer = "6" |
10 | LAYERSERIES_COMPAT_openstack-compute-deploy-layer = "sumo" | 10 | LAYERSERIES_COMPAT_openstack-compute-deploy-layer = "sumo" |
11 | |||
12 | LAYERDEPENDS_openstack-compute-deploy-layer = " \ | ||
13 | core \ | ||
14 | cloud-services-layer \ | ||
15 | openembedded-layer \ | ||
16 | networking-layer \ | ||
17 | virtualization-layer \ | ||
18 | openstack-layer \ | ||
19 | " | ||
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 | |||
20 | revision: HEAD | 20 | revision: HEAD |
21 | layers: meta-oe | 21 | layers: meta-oe |
22 | meta-networking | 22 | meta-networking |
23 | meta-ruby | ||
24 | 23 | ||
25 | URI: git://git.yoctoproject.org/meta-virtualization | 24 | URI: git://git.yoctoproject.org/meta-virtualization |
26 | branch: master | 25 | 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}/" | |||
9 | # We want this layer to have higher priority than any other meta-openstack layers | 9 | # We want this layer to have higher priority than any other meta-openstack layers |
10 | BBFILE_PRIORITY_openstack-compute-test-config-layer = "100" | 10 | BBFILE_PRIORITY_openstack-compute-test-config-layer = "100" |
11 | LAYERSERIES_COMPAT_openstack-compute-test-config-layer = "sumo" | 11 | LAYERSERIES_COMPAT_openstack-compute-test-config-layer = "sumo" |
12 | |||
13 | LAYERDEPENDS_openstack-compute-test-config-layer = " \ | ||
14 | openstack-compute-deploy-layer \ | ||
15 | " | ||
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 | |||
19 | revision: HEAD | 19 | revision: HEAD |
20 | layers: meta-oe | 20 | layers: meta-oe |
21 | meta-networking | 21 | meta-networking |
22 | meta-ruby | ||
23 | 22 | ||
24 | URI: git://git.yoctoproject.org/meta-virtualization | 23 | URI: git://git.yoctoproject.org/meta-virtualization |
25 | branch: master | 24 | 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" | |||
8 | BBFILE_PATTERN_openstack-controller-deploy-layer := "^${LAYERDIR}/" | 8 | BBFILE_PATTERN_openstack-controller-deploy-layer := "^${LAYERDIR}/" |
9 | BBFILE_PRIORITY_openstack-controller-deploy-layer = "6" | 9 | BBFILE_PRIORITY_openstack-controller-deploy-layer = "6" |
10 | LAYERSERIES_COMPAT_openstack-controller-deploy-layer = "sumo" | 10 | LAYERSERIES_COMPAT_openstack-controller-deploy-layer = "sumo" |
11 | |||
12 | LAYERDEPENDS_openstack-controller-deploy-layer = " \ | ||
13 | core \ | ||
14 | cloud-services-layer \ | ||
15 | openembedded-layer \ | ||
16 | networking-layer \ | ||
17 | virtualization-layer \ | ||
18 | openstack-layer \ | ||
19 | " | ||
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 | |||
20 | revision: HEAD | 20 | revision: HEAD |
21 | layers: meta-oe | 21 | layers: meta-oe |
22 | meta-networking | 22 | meta-networking |
23 | meta-ruby | ||
24 | 23 | ||
25 | URI: git://git.yoctoproject.org/meta-virtualization | 24 | URI: git://git.yoctoproject.org/meta-virtualization |
26 | branch: master | 25 | 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}/" | |||
9 | # We want this layer to have higher priority than any other meta-openstack layers | 9 | # We want this layer to have higher priority than any other meta-openstack layers |
10 | BBFILE_PRIORITY_openstack-controller-test-config-layer = "100" | 10 | BBFILE_PRIORITY_openstack-controller-test-config-layer = "100" |
11 | LAYERSERIES_COMPAT_openstack-controller-test-config-layer = "sumo" | 11 | LAYERSERIES_COMPAT_openstack-controller-test-config-layer = "sumo" |
12 | |||
13 | LAYERDEPENDS_openstack-controller-test-config-layer = " \ | ||
14 | openstack-controller-deploy-layer \ | ||
15 | " | ||
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 | |||
19 | revision: HEAD | 19 | revision: HEAD |
20 | layers: meta-oe | 20 | layers: meta-oe |
21 | meta-networking | 21 | meta-networking |
22 | meta-ruby | ||
23 | 22 | ||
24 | URI: git://git.yoctoproject.org/meta-virtualization | 23 | URI: git://git.yoctoproject.org/meta-virtualization |
25 | branch: master | 24 | 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" | |||
8 | BBFILE_PATTERN_openstack-qemu-layer := "^${LAYERDIR}/" | 8 | BBFILE_PATTERN_openstack-qemu-layer := "^${LAYERDIR}/" |
9 | BBFILE_PRIORITY_openstack-qemu-layer = "6" | 9 | BBFILE_PRIORITY_openstack-qemu-layer = "6" |
10 | LAYERSERIES_COMPAT_openstack-qemu-layer = "sumo" | 10 | LAYERSERIES_COMPAT_openstack-qemu-layer = "sumo" |
11 | |||
12 | LAYERDEPENDS_openstack-qemu-layer = " \ | ||
13 | core \ | ||
14 | cloud-services-layer \ | ||
15 | openembedded-layer \ | ||
16 | networking-layer \ | ||
17 | virtualization-layer \ | ||
18 | openstack-layer \ | ||
19 | " | ||
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 | |||
19 | revision: HEAD | 19 | revision: HEAD |
20 | layers: meta-oe | 20 | layers: meta-oe |
21 | meta-networking | 21 | meta-networking |
22 | meta-ruby | ||
23 | 22 | ||
24 | URI: git://git.yoctoproject.org/meta-virtualization | 23 | URI: git://git.yoctoproject.org/meta-virtualization |
25 | branch: master | 24 | 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" | |||
8 | BBFILE_PATTERN_openstack-swift-deploy-layer := "^${LAYERDIR}/" | 8 | BBFILE_PATTERN_openstack-swift-deploy-layer := "^${LAYERDIR}/" |
9 | BBFILE_PRIORITY_openstack-swift-deploy-layer = "6" | 9 | BBFILE_PRIORITY_openstack-swift-deploy-layer = "6" |
10 | LAYERSERIES_COMPAT_openstack-swift-deploy-layer = "sumo" | 10 | LAYERSERIES_COMPAT_openstack-swift-deploy-layer = "sumo" |
11 | |||
12 | LAYERDEPENDS_openstack-swift-deploy-layer = " \ | ||
13 | core \ | ||
14 | cloud-services-layer \ | ||
15 | openembedded-layer \ | ||
16 | networking-layer \ | ||
17 | virtualization-layer \ | ||
18 | openstack-layer \ | ||
19 | " | ||
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" | |||
10 | LAYERSERIES_COMPAT_openstack-layer = "sumo" | 10 | LAYERSERIES_COMPAT_openstack-layer = "sumo" |
11 | BB_DANGLINGAPPENDS_WARNONLY ?= "true" | 11 | BB_DANGLINGAPPENDS_WARNONLY ?= "true" |
12 | 12 | ||
13 | LAYERDEPENDS_openstack-layer = " \ | ||
14 | core \ | ||
15 | cloud-services-layer \ | ||
16 | openembedded-layer \ | ||
17 | networking-layer \ | ||
18 | filesystems-layer \ | ||
19 | webserver \ | ||
20 | meta-python \ | ||
21 | virtualization-layer \ | ||
22 | " | ||
23 | |||
13 | # pre 0.4.0 greenlet versions segfault python | 24 | # pre 0.4.0 greenlet versions segfault python |
14 | PREFERRED_VERSION_python-greenlet = "0.4.5" | 25 | PREFERRED_VERSION_python-greenlet = "0.4.5" |
15 | PREFERRED_VERSION_python-sqlalchemy = "1.0.8" | 26 | PREFERRED_VERSION_python-sqlalchemy = "1.0.8" |