summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2018-10-08 11:07:47 +0800
committerBruce Ashfield <bruce.ashfield@windriver.com>2018-10-09 23:22:57 -0400
commit352220329e1023f1781d9a188a1b06644233ce4b (patch)
tree6445573d28da44054ac4c86b087d6839c3be8ba5
parent702fdd7945395f5cc3f9047cbb85f03173befad4 (diff)
downloadmeta-cloud-services-352220329e1023f1781d9a188a1b06644233ce4b.tar.gz
layer.conf: Add thud to LAYERSERIES_COMPAT
Since `9ec5a8a layer.conf: Drop sumo from LAYERSERIES_CORENAMES' and `9867924 layer.conf: Add thud to LAYERSERIES_CORENAMES' applied in oe-core, add thud to LAYERSERIES_COMPAT Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--meta-openstack-aio-deploy/conf/layer.conf2
-rw-r--r--meta-openstack-compute-deploy/conf/layer.conf2
-rw-r--r--meta-openstack-compute-test-config/conf/layer.conf2
-rw-r--r--meta-openstack-controller-deploy/conf/layer.conf2
-rw-r--r--meta-openstack-controller-test-config/conf/layer.conf2
-rw-r--r--meta-openstack-qemu/conf/layer.conf2
-rw-r--r--meta-openstack-swift-deploy/conf/layer.conf2
-rw-r--r--meta-openstack/conf/layer.conf2
8 files changed, 8 insertions, 8 deletions
diff --git a/meta-openstack-aio-deploy/conf/layer.conf b/meta-openstack-aio-deploy/conf/layer.conf
index 46622a6..89fede8 100644
--- a/meta-openstack-aio-deploy/conf/layer.conf
+++ b/meta-openstack-aio-deploy/conf/layer.conf
@@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
7BBFILE_COLLECTIONS += "openstack-aio-deploy-layer" 7BBFILE_COLLECTIONS += "openstack-aio-deploy-layer"
8BBFILE_PATTERN_openstack-aio-deploy-layer := "^${LAYERDIR}/" 8BBFILE_PATTERN_openstack-aio-deploy-layer := "^${LAYERDIR}/"
9BBFILE_PRIORITY_openstack-aio-deploy-layer = "6" 9BBFILE_PRIORITY_openstack-aio-deploy-layer = "6"
10LAYERSERIES_COMPAT_openstack-aio-deploy-layer = "sumo" 10LAYERSERIES_COMPAT_openstack-aio-deploy-layer = "sumo thud"
11 11
12LAYERDEPENDS_openstack-aio-deploy-layer = " \ 12LAYERDEPENDS_openstack-aio-deploy-layer = " \
13 core \ 13 core \
diff --git a/meta-openstack-compute-deploy/conf/layer.conf b/meta-openstack-compute-deploy/conf/layer.conf
index e2192a1..999e95e 100644
--- a/meta-openstack-compute-deploy/conf/layer.conf
+++ b/meta-openstack-compute-deploy/conf/layer.conf
@@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
7BBFILE_COLLECTIONS += "openstack-compute-deploy-layer" 7BBFILE_COLLECTIONS += "openstack-compute-deploy-layer"
8BBFILE_PATTERN_openstack-compute-deploy-layer := "^${LAYERDIR}/" 8BBFILE_PATTERN_openstack-compute-deploy-layer := "^${LAYERDIR}/"
9BBFILE_PRIORITY_openstack-compute-deploy-layer = "6" 9BBFILE_PRIORITY_openstack-compute-deploy-layer = "6"
10LAYERSERIES_COMPAT_openstack-compute-deploy-layer = "sumo" 10LAYERSERIES_COMPAT_openstack-compute-deploy-layer = "sumo thud"
11 11
12LAYERDEPENDS_openstack-compute-deploy-layer = " \ 12LAYERDEPENDS_openstack-compute-deploy-layer = " \
13 core \ 13 core \
diff --git a/meta-openstack-compute-test-config/conf/layer.conf b/meta-openstack-compute-test-config/conf/layer.conf
index 7fca615..a8c69d7 100644
--- a/meta-openstack-compute-test-config/conf/layer.conf
+++ b/meta-openstack-compute-test-config/conf/layer.conf
@@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "openstack-compute-test-config-layer"
8BBFILE_PATTERN_openstack-compute-test-config-layer := "^${LAYERDIR}/" 8BBFILE_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
10BBFILE_PRIORITY_openstack-compute-test-config-layer = "100" 10BBFILE_PRIORITY_openstack-compute-test-config-layer = "100"
11LAYERSERIES_COMPAT_openstack-compute-test-config-layer = "sumo" 11LAYERSERIES_COMPAT_openstack-compute-test-config-layer = "sumo thud"
12 12
13LAYERDEPENDS_openstack-compute-test-config-layer = " \ 13LAYERDEPENDS_openstack-compute-test-config-layer = " \
14 openstack-compute-deploy-layer \ 14 openstack-compute-deploy-layer \
diff --git a/meta-openstack-controller-deploy/conf/layer.conf b/meta-openstack-controller-deploy/conf/layer.conf
index 73ac493..51f510f 100644
--- a/meta-openstack-controller-deploy/conf/layer.conf
+++ b/meta-openstack-controller-deploy/conf/layer.conf
@@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
7BBFILE_COLLECTIONS += "openstack-controller-deploy-layer" 7BBFILE_COLLECTIONS += "openstack-controller-deploy-layer"
8BBFILE_PATTERN_openstack-controller-deploy-layer := "^${LAYERDIR}/" 8BBFILE_PATTERN_openstack-controller-deploy-layer := "^${LAYERDIR}/"
9BBFILE_PRIORITY_openstack-controller-deploy-layer = "6" 9BBFILE_PRIORITY_openstack-controller-deploy-layer = "6"
10LAYERSERIES_COMPAT_openstack-controller-deploy-layer = "sumo" 10LAYERSERIES_COMPAT_openstack-controller-deploy-layer = "sumo thud"
11 11
12LAYERDEPENDS_openstack-controller-deploy-layer = " \ 12LAYERDEPENDS_openstack-controller-deploy-layer = " \
13 core \ 13 core \
diff --git a/meta-openstack-controller-test-config/conf/layer.conf b/meta-openstack-controller-test-config/conf/layer.conf
index 3734375..507b1ed 100644
--- a/meta-openstack-controller-test-config/conf/layer.conf
+++ b/meta-openstack-controller-test-config/conf/layer.conf
@@ -8,7 +8,7 @@ BBFILE_COLLECTIONS += "openstack-controller-test-config-layer"
8BBFILE_PATTERN_openstack-controller-test-config-layer := "^${LAYERDIR}/" 8BBFILE_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
10BBFILE_PRIORITY_openstack-controller-test-config-layer = "100" 10BBFILE_PRIORITY_openstack-controller-test-config-layer = "100"
11LAYERSERIES_COMPAT_openstack-controller-test-config-layer = "sumo" 11LAYERSERIES_COMPAT_openstack-controller-test-config-layer = "sumo thud"
12 12
13LAYERDEPENDS_openstack-controller-test-config-layer = " \ 13LAYERDEPENDS_openstack-controller-test-config-layer = " \
14 openstack-controller-deploy-layer \ 14 openstack-controller-deploy-layer \
diff --git a/meta-openstack-qemu/conf/layer.conf b/meta-openstack-qemu/conf/layer.conf
index d3ddf82..9addb4a 100644
--- a/meta-openstack-qemu/conf/layer.conf
+++ b/meta-openstack-qemu/conf/layer.conf
@@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
7BBFILE_COLLECTIONS += "openstack-qemu-layer" 7BBFILE_COLLECTIONS += "openstack-qemu-layer"
8BBFILE_PATTERN_openstack-qemu-layer := "^${LAYERDIR}/" 8BBFILE_PATTERN_openstack-qemu-layer := "^${LAYERDIR}/"
9BBFILE_PRIORITY_openstack-qemu-layer = "6" 9BBFILE_PRIORITY_openstack-qemu-layer = "6"
10LAYERSERIES_COMPAT_openstack-qemu-layer = "sumo" 10LAYERSERIES_COMPAT_openstack-qemu-layer = "sumo thud"
11 11
12LAYERDEPENDS_openstack-qemu-layer = " \ 12LAYERDEPENDS_openstack-qemu-layer = " \
13 core \ 13 core \
diff --git a/meta-openstack-swift-deploy/conf/layer.conf b/meta-openstack-swift-deploy/conf/layer.conf
index 12108ef..bfe40fe 100644
--- a/meta-openstack-swift-deploy/conf/layer.conf
+++ b/meta-openstack-swift-deploy/conf/layer.conf
@@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
7BBFILE_COLLECTIONS += "openstack-swift-deploy-layer" 7BBFILE_COLLECTIONS += "openstack-swift-deploy-layer"
8BBFILE_PATTERN_openstack-swift-deploy-layer := "^${LAYERDIR}/" 8BBFILE_PATTERN_openstack-swift-deploy-layer := "^${LAYERDIR}/"
9BBFILE_PRIORITY_openstack-swift-deploy-layer = "6" 9BBFILE_PRIORITY_openstack-swift-deploy-layer = "6"
10LAYERSERIES_COMPAT_openstack-swift-deploy-layer = "sumo" 10LAYERSERIES_COMPAT_openstack-swift-deploy-layer = "sumo thud"
11 11
12LAYERDEPENDS_openstack-swift-deploy-layer = " \ 12LAYERDEPENDS_openstack-swift-deploy-layer = " \
13 core \ 13 core \
diff --git a/meta-openstack/conf/layer.conf b/meta-openstack/conf/layer.conf
index 0370c81..4ce6ea7 100644
--- a/meta-openstack/conf/layer.conf
+++ b/meta-openstack/conf/layer.conf
@@ -7,7 +7,7 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend"
7BBFILE_COLLECTIONS += "openstack-layer" 7BBFILE_COLLECTIONS += "openstack-layer"
8BBFILE_PATTERN_openstack-layer := "^${LAYERDIR}/" 8BBFILE_PATTERN_openstack-layer := "^${LAYERDIR}/"
9BBFILE_PRIORITY_openstack-layer = "5" 9BBFILE_PRIORITY_openstack-layer = "5"
10LAYERSERIES_COMPAT_openstack-layer = "sumo" 10LAYERSERIES_COMPAT_openstack-layer = "sumo thud"
11BB_DANGLINGAPPENDS_WARNONLY ?= "true" 11BB_DANGLINGAPPENDS_WARNONLY ?= "true"
12 12
13LAYERDEPENDS_openstack-layer = " \ 13LAYERDEPENDS_openstack-layer = " \