From 620ec0b3517cab2cf90c1b83f1f8e93b00c3a581 Mon Sep 17 00:00:00 2001 From: "Jeremy A. Puhlman" Date: Mon, 21 May 2018 12:35:57 -0700 Subject: Add LAYERSERIES_COMPAT Signed-off-by: Jeremy Puhlman Signed-off-by: Bruce Ashfield --- conf/layer.conf | 1 + meta-openstack-aio-deploy/conf/layer.conf | 2 +- meta-openstack-compute-deploy/conf/layer.conf | 1 + meta-openstack-compute-test-config/conf/layer.conf | 1 + meta-openstack-controller-deploy/conf/layer.conf | 1 + meta-openstack-controller-test-config/conf/layer.conf | 1 + meta-openstack-qemu/conf/layer.conf | 1 + meta-openstack-swift-deploy/conf/layer.conf | 1 + meta-openstack/conf/layer.conf | 2 +- 9 files changed, 9 insertions(+), 2 deletions(-) diff --git a/conf/layer.conf b/conf/layer.conf index b30a99f..f69e8b1 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -7,3 +7,4 @@ BBFILES += "${LAYERDIR}/recipes*/*/*.bb ${LAYERDIR}/recipes*/*/*.bbappend" BBFILE_COLLECTIONS += "cloud-services-layer" BBFILE_PATTERN_cloud-services-layer := "^${LAYERDIR}/" BBFILE_PRIORITY_cloud-services-layer = "5" +LAYERSERIES_COMPAT_cloud-services-layer = "sumo" diff --git a/meta-openstack-aio-deploy/conf/layer.conf b/meta-openstack-aio-deploy/conf/layer.conf index 154a98d..6d256c4 100644 --- a/meta-openstack-aio-deploy/conf/layer.conf +++ b/meta-openstack-aio-deploy/conf/layer.conf @@ -7,4 +7,4 @@ 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" diff --git a/meta-openstack-compute-deploy/conf/layer.conf b/meta-openstack-compute-deploy/conf/layer.conf index 44a035b..91a83e6 100644 --- a/meta-openstack-compute-deploy/conf/layer.conf +++ b/meta-openstack-compute-deploy/conf/layer.conf @@ -7,3 +7,4 @@ 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" diff --git a/meta-openstack-compute-test-config/conf/layer.conf b/meta-openstack-compute-test-config/conf/layer.conf index f3b7bcb..bc070d8 100644 --- a/meta-openstack-compute-test-config/conf/layer.conf +++ b/meta-openstack-compute-test-config/conf/layer.conf @@ -8,3 +8,4 @@ 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" diff --git a/meta-openstack-controller-deploy/conf/layer.conf b/meta-openstack-controller-deploy/conf/layer.conf index de8f435..a2c9d16 100644 --- a/meta-openstack-controller-deploy/conf/layer.conf +++ b/meta-openstack-controller-deploy/conf/layer.conf @@ -7,3 +7,4 @@ 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" diff --git a/meta-openstack-controller-test-config/conf/layer.conf b/meta-openstack-controller-test-config/conf/layer.conf index 8a6cfcb..dcae15d 100644 --- a/meta-openstack-controller-test-config/conf/layer.conf +++ b/meta-openstack-controller-test-config/conf/layer.conf @@ -8,3 +8,4 @@ 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" diff --git a/meta-openstack-qemu/conf/layer.conf b/meta-openstack-qemu/conf/layer.conf index 6761143..b6d45ba 100644 --- a/meta-openstack-qemu/conf/layer.conf +++ b/meta-openstack-qemu/conf/layer.conf @@ -7,3 +7,4 @@ 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" diff --git a/meta-openstack-swift-deploy/conf/layer.conf b/meta-openstack-swift-deploy/conf/layer.conf index 45f9ee8..d021fcc 100644 --- a/meta-openstack-swift-deploy/conf/layer.conf +++ b/meta-openstack-swift-deploy/conf/layer.conf @@ -7,3 +7,4 @@ 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" diff --git a/meta-openstack/conf/layer.conf b/meta-openstack/conf/layer.conf index 2565b92..f9443e2 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" BB_DANGLINGAPPENDS_WARNONLY ?= "true" # pre 0.4.0 greenlet versions segfault python -- cgit v1.2.3-54-g00ecf