From 352220329e1023f1781d9a188a1b06644233ce4b Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Mon, 8 Oct 2018 11:07:47 +0800 Subject: 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 Signed-off-by: Bruce Ashfield --- meta-openstack-aio-deploy/conf/layer.conf | 2 +- meta-openstack-compute-deploy/conf/layer.conf | 2 +- meta-openstack-compute-test-config/conf/layer.conf | 2 +- meta-openstack-controller-deploy/conf/layer.conf | 2 +- meta-openstack-controller-test-config/conf/layer.conf | 2 +- meta-openstack-qemu/conf/layer.conf | 2 +- meta-openstack-swift-deploy/conf/layer.conf | 2 +- meta-openstack/conf/layer.conf | 2 +- 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" 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" +LAYERSERIES_COMPAT_openstack-aio-deploy-layer = "sumo thud" LAYERDEPENDS_openstack-aio-deploy-layer = " \ 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" 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" +LAYERSERIES_COMPAT_openstack-compute-deploy-layer = "sumo thud" LAYERDEPENDS_openstack-compute-deploy-layer = " \ 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" 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" +LAYERSERIES_COMPAT_openstack-compute-test-config-layer = "sumo thud" LAYERDEPENDS_openstack-compute-test-config-layer = " \ 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" 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" +LAYERSERIES_COMPAT_openstack-controller-deploy-layer = "sumo thud" LAYERDEPENDS_openstack-controller-deploy-layer = " \ 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" 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" +LAYERSERIES_COMPAT_openstack-controller-test-config-layer = "sumo thud" LAYERDEPENDS_openstack-controller-test-config-layer = " \ 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" BBFILE_COLLECTIONS += "openstack-qemu-layer" BBFILE_PATTERN_openstack-qemu-layer := "^${LAYERDIR}/" BBFILE_PRIORITY_openstack-qemu-layer = "6" -LAYERSERIES_COMPAT_openstack-qemu-layer = "sumo" +LAYERSERIES_COMPAT_openstack-qemu-layer = "sumo thud" LAYERDEPENDS_openstack-qemu-layer = " \ 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" 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" +LAYERSERIES_COMPAT_openstack-swift-deploy-layer = "sumo thud" LAYERDEPENDS_openstack-swift-deploy-layer = " \ 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" BBFILE_COLLECTIONS += "openstack-layer" BBFILE_PATTERN_openstack-layer := "^${LAYERDIR}/" BBFILE_PRIORITY_openstack-layer = "5" -LAYERSERIES_COMPAT_openstack-layer = "sumo" +LAYERSERIES_COMPAT_openstack-layer = "sumo thud" BB_DANGLINGAPPENDS_WARNONLY ?= "true" LAYERDEPENDS_openstack-layer = " \ -- cgit v1.2.3-54-g00ecf