Skip to contentSkip to conversation

meta-openstack: be compatible with dunfell

PATCH In review Chen Qi 2 participants 5 messages Jun 8, 2020 – Jun 17, 2020 1 message not in the archive

lore
Share & tools
lore

Chen Qi

author
#0 lore raw

PATCH 1/1 meta-openstack: be compatible with dunfell

---
 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 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
meta-openstack-aio-deploy/conf/layer.conf +1 -1
index f3d2c5f2..c8bdaff5 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-aio-deploy-layer = "thud warrior zeus dunfell"
 
 LAYERDEPENDS_openstack-aio-deploy-layer = " \
 	core \
meta-openstack-compute-deploy/conf/layer.conf +1 -1
index e25cf3e0..3d700330 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-compute-deploy-layer = "thud warrior zeus dunfell"
 
 LAYERDEPENDS_openstack-compute-deploy-layer = " \
 	core \
meta-openstack-compute-test-config/conf/layer.conf +1 -1
index dfa5f31b..b082d609 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-compute-test-config-layer = "thud warrior zeus dunfell"
 
 LAYERDEPENDS_openstack-compute-test-config-layer = " \
 	openstack-compute-deploy-layer \
meta-openstack-controller-deploy/conf/layer.conf +1 -1
index e8be8321..e9786313 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-controller-deploy-layer = "thud warrior zeus dunfell"
 
 LAYERDEPENDS_openstack-controller-deploy-layer = " \
 	core \
meta-openstack-controller-test-config/conf/layer.conf +1 -1
index b81f21e0..695767d1 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-controller-test-config-layer = "thud warrior zeus dunfell"
 
 LAYERDEPENDS_openstack-controller-test-config-layer = " \
 	openstack-controller-deploy-layer \
meta-openstack-qemu/conf/layer.conf +1 -1
index 98a35b40..8f6378d9 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-qemu-layer = "thud warrior zeus dunfell"
 
 LAYERDEPENDS_openstack-qemu-layer = " \
 	core \
meta-openstack-swift-deploy/conf/layer.conf +1 -1
index e9675e28..e48aa601 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-swift-deploy-layer = "thud warrior zeus dunfell"
 
 LAYERDEPENDS_openstack-swift-deploy-layer = " \
 	core \
Signature · 1 line
2.21.0
#1 lore raw

Hmm. I already did a patch for this, it looks like I forgot to push it :(

Bruce

Quoted 107 lines · Chen Qi
---
 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 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
meta-openstack-aio-deploy/conf/layer.conf +1 -1
index f3d2c5f2..c8bdaff5 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-aio-deploy-layer = "thud warrior zeus dunfell"
 
 LAYERDEPENDS_openstack-aio-deploy-layer = " \
        core \
meta-openstack-compute-deploy/conf/layer.conf +1 -1
index e25cf3e0..3d700330 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-compute-deploy-layer = "thud warrior zeus dunfell"
 
 LAYERDEPENDS_openstack-compute-deploy-layer = " \
        core \
meta-openstack-compute-test-config/conf/layer.conf +1 -1
index dfa5f31b..b082d609 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-compute-test-config-layer = "thud warrior zeus dunfell"
 
 LAYERDEPENDS_openstack-compute-test-config-layer = " \
        openstack-compute-deploy-layer \
meta-openstack-controller-deploy/conf/layer.conf +1 -1
index e8be8321..e9786313 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-controller-deploy-layer = "thud warrior zeus dunfell"
 
 LAYERDEPENDS_openstack-controller-deploy-layer = " \
        core \
meta-openstack-controller-test-config/conf/layer.conf +1 -1
index b81f21e0..695767d1 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-controller-test-config-layer = "thud warrior zeus dunfell"
 
 LAYERDEPENDS_openstack-controller-test-config-layer = " \
        openstack-controller-deploy-layer \
meta-openstack-qemu/conf/layer.conf +1 -1
index 98a35b40..8f6378d9 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-qemu-layer = "thud warrior zeus dunfell"
 
 LAYERDEPENDS_openstack-qemu-layer = " \
        core \
meta-openstack-swift-deploy/conf/layer.conf +1 -2
index e9675e28..e48aa601 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-swift-deploy-layer = "thud warrior zeus dunfell"
 
 LAYERDEPENDS_openstack-swift-deploy-layer = " \
        core \
--

2.21.0

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

A message that is not in the archive (sent off-list or not yet received): [email protected]

#3 lore raw
Quoted 3 lines · Bruce Ashfield via lists.yoctoproject.org

Hmm. I already did a patch for this, it looks like I forgot to push it :(

oh wait, I see my dunfell patch.

I excluded those layers on purpose, since the deployment hasn't been tested in quite a while. Did you confirm that the layers build when bumping the compatibility. I honestly expect runtime errors .. but did anyone try booting with them enabled ?

Bruce

Quoted 118 lines

Bruce

Quoted 104 lines · Chen Qi
---
 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 +-
 7 files changed, 7 insertions(+), 7 deletions(-)
meta-openstack-aio-deploy/conf/layer.conf +1 -1
index f3d2c5f2..c8bdaff5 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-aio-deploy-layer = "thud warrior zeus dunfell"
 
 LAYERDEPENDS_openstack-aio-deploy-layer = " \
        core \
meta-openstack-compute-deploy/conf/layer.conf +1 -1
index e25cf3e0..3d700330 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-compute-deploy-layer = "thud warrior zeus dunfell"
 
 LAYERDEPENDS_openstack-compute-deploy-layer = " \
        core \
meta-openstack-compute-test-config/conf/layer.conf +1 -1
index dfa5f31b..b082d609 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-compute-test-config-layer = "thud warrior zeus dunfell"
 
 LAYERDEPENDS_openstack-compute-test-config-layer = " \
        openstack-compute-deploy-layer \
meta-openstack-controller-deploy/conf/layer.conf +1 -1
index e8be8321..e9786313 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-controller-deploy-layer = "thud warrior zeus dunfell"
 
 LAYERDEPENDS_openstack-controller-deploy-layer = " \
        core \
meta-openstack-controller-test-config/conf/layer.conf +1 -1
index b81f21e0..695767d1 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-controller-test-config-layer = "thud warrior zeus dunfell"
 
 LAYERDEPENDS_openstack-controller-test-config-layer = " \
        openstack-controller-deploy-layer \
meta-openstack-qemu/conf/layer.conf +1 -1
index 98a35b40..8f6378d9 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-qemu-layer = "thud warrior zeus dunfell"
 
 LAYERDEPENDS_openstack-qemu-layer = " \
        core \
meta-openstack-swift-deploy/conf/layer.conf +1 -2
index e9675e28..e48aa601 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-swift-deploy-layer = "thud warrior zeus dunfell"
 
 LAYERDEPENDS_openstack-swift-deploy-layer = " \
        core \
--
Quoted 3 lines

2.21.0

--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
author
#4 lore raw
Quoted 5 lines · Bruce Ashfield
Quoted 2 lines · Bruce Ashfield via lists.yoctoproject.org

Hmm. I already did a patch for this, it looks like I forgot to push it :(

Quoted 8 lines

oh wait, I see my dunfell patch.

I excluded those layers on purpose, since the deployment hasn't been tested in quite a while. Did you confirm that the layers build when bumping the compatibility. I honestly expect runtime errors .. but did anyone try booting with them enabled ?

Bruce

No. I didn't do any test. These layers are included in my bblayers.conf, I have to add 'dunfell', otherwise bitbake errors out.

Regards,
Chen Qi

Quoted 119 lines
Quoted 117 lines

Bruce

Quoted 103 lines · Chen Qi
---
  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 +-
  7 files changed, 7 insertions(+), 7 deletions(-)
meta-openstack-aio-deploy/conf/layer.conf +1 -1
index f3d2c5f2..c8bdaff5 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-aio-deploy-layer = "thud warrior zeus dunfell"
 
  LAYERDEPENDS_openstack-aio-deploy-layer = " \
         core \
meta-openstack-compute-deploy/conf/layer.conf +1 -1
index e25cf3e0..3d700330 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-compute-deploy-layer = "thud warrior zeus dunfell"
 
  LAYERDEPENDS_openstack-compute-deploy-layer = " \
         core \
meta-openstack-compute-test-config/conf/layer.conf +1 -1
index dfa5f31b..b082d609 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-compute-test-config-layer = "thud warrior zeus dunfell"
 
  LAYERDEPENDS_openstack-compute-test-config-layer = " \
         openstack-compute-deploy-layer \
meta-openstack-controller-deploy/conf/layer.conf +1 -1
index e8be8321..e9786313 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-controller-deploy-layer = "thud warrior zeus dunfell"
 
  LAYERDEPENDS_openstack-controller-deploy-layer = " \
         core \
meta-openstack-controller-test-config/conf/layer.conf +1 -1
index b81f21e0..695767d1 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-controller-test-config-layer = "thud warrior zeus dunfell"
 
  LAYERDEPENDS_openstack-controller-test-config-layer = " \
         openstack-controller-deploy-layer \
meta-openstack-qemu/conf/layer.conf +1 -1
index 98a35b40..8f6378d9 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-qemu-layer = "thud warrior zeus dunfell"
 
  LAYERDEPENDS_openstack-qemu-layer = " \
         core \
meta-openstack-swift-deploy/conf/layer.conf +1 -2
index e9675e28..e48aa601 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-swift-deploy-layer = "thud warrior zeus dunfell"
 
  LAYERDEPENDS_openstack-swift-deploy-layer = " \
         core \
--
Quoted 3 lines

2.21.0

--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

#5 lore raw
Quoted 14 lines · ChenQi
Quoted 12 lines · Bruce Ashfield
Quoted 2 lines · Bruce Ashfield via lists.yoctoproject.org

Hmm. I already did a patch for this, it looks like I forgot to push it :(

oh wait, I see my dunfell patch.

I excluded those layers on purpose, since the deployment hasn't been tested in quite a while. Did you confirm that the layers build when bumping the compatibility. I honestly expect runtime errors .. but did anyone try booting with them enabled ?

Quoted 4 lines
Quoted 1 line

Bruce

No. I didn't do any test. These layers are included in my bblayers.conf, I have to add 'dunfell', otherwise bitbake errors out.

I was going to merge this today, but when I applied it to master and dunfell, they don't have zeus in the compatible layer list, but yet your patch does. I had done the same thing with zeus (skipping the compatibility bump, until someone asked).

Are you seeing the same thing ? or am I somehow seeing the layer.conf's wrong in my merge layers ?

Bruce

Quoted 125 lines

Regards,
Chen Qi

Quoted 119 lines
Quoted 117 lines

Bruce

Quoted 103 lines · Chen Qi
---
  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 +-
  7 files changed, 7 insertions(+), 7 deletions(-)
meta-openstack-aio-deploy/conf/layer.conf +1 -1
index f3d2c5f2..c8bdaff5 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-aio-deploy-layer = "thud warrior zeus dunfell"
 
  LAYERDEPENDS_openstack-aio-deploy-layer = " \
         core \
meta-openstack-compute-deploy/conf/layer.conf +1 -1
index e25cf3e0..3d700330 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-compute-deploy-layer = "thud warrior zeus dunfell"
 
  LAYERDEPENDS_openstack-compute-deploy-layer = " \
         core \
meta-openstack-compute-test-config/conf/layer.conf +1 -1
index dfa5f31b..b082d609 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-compute-test-config-layer = "thud warrior zeus dunfell"
 
  LAYERDEPENDS_openstack-compute-test-config-layer = " \
         openstack-compute-deploy-layer \
meta-openstack-controller-deploy/conf/layer.conf +1 -1
index e8be8321..e9786313 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-controller-deploy-layer = "thud warrior zeus dunfell"
 
  LAYERDEPENDS_openstack-controller-deploy-layer = " \
         core \
meta-openstack-controller-test-config/conf/layer.conf +1 -1
index b81f21e0..695767d1 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-controller-test-config-layer = "thud warrior zeus dunfell"
 
  LAYERDEPENDS_openstack-controller-test-config-layer = " \
         openstack-controller-deploy-layer \
meta-openstack-qemu/conf/layer.conf +1 -1
index 98a35b40..8f6378d9 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-qemu-layer = "thud warrior zeus dunfell"
 
  LAYERDEPENDS_openstack-qemu-layer = " \
         core \
meta-openstack-swift-deploy/conf/layer.conf +1 -2
index e9675e28..e48aa601 100644
@@ -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 = "thud warrior zeus"
+LAYERSERIES_COMPAT_openstack-swift-deploy-layer = "thud warrior zeus dunfell"
 
  LAYERDEPENDS_openstack-swift-deploy-layer = " \
         core \
--
Quoted 3 lines

2.21.0

--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II