Skip to contentSkip to conversation

CheckYoctoCompat.py: rename yocto-compat-layer to yocto-check-layer

PATCH In review Stephano Cetola 2 participants 3 messages Sep 21, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 CheckYoctoCompat.py: rename yocto-compat-layer to yocto-check-layer

This script name was changed in the following commit:

b46e05677b342df44829ffe8bcfbfc954e906030

This patch updates the script name to match.

[YOCTO #12110]

---
 lib/python2.7/site-packages/autobuilder/buildsteps/CheckYoctoCompat.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
lib/python2.7/site-packages/autobuilder/buildsteps/CheckYoctoCompat.py +2 -1
index 134adaa51..62eddae50 100644
@@ -41,11 +41,12 @@ class CheckYoctoCompat(BitbakeShellCommand):
 
         layerversioncore = int(self.getProperty("layerversion_core", "0"))
         # yocto-compat-layer-wrapper was introduced in Pyro
+        # it was renamed to yocto-check-layer-wrapper Rocko
         if layerversioncore >= 10:
             command = ". ./oe-init-build-env;"
             for layer in self.layers:
                 layerpath = os.path.join(builddir, layer)
-                cmd = "yocto-compat-layer-wrapper {}".format(layerpath)
+                cmd = "yocto-check-layer-wrapper {}".format(layerpath)
                 cmd = cmd + " || export CL_FAIL=1;"
                 command = command + cmd
             command = command + 'if [ "$CL_FAIL" = "1" ]; then exit 1; fi;'
Signature · 1 line
2.14.1
#1 lore raw
Quoted 18 lines · Stephano Cetola

This script name was changed in the following commit:

b46e05677b342df44829ffe8bcfbfc954e906030

This patch updates the script name to match.

[YOCTO #12110]

---
  lib/python2.7/site-packages/autobuilder/buildsteps/CheckYoctoCompat.py | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
lib/python2.7/site-packages/autobuilder/buildsteps/CheckYoctoCompat.py +0 -0
index 134adaa51..62eddae50 100644

lib/python2.7/site-packages/autobuilder/buildsteps/CheckYoctoCompat.py class CheckYoctoCompat(BitbakeShellCommand): · line 49

Quoted 10 lines
lib/python2.7/site-packages/autobuilder/buildsteps/CheckYoctoCompat.py +2 -1
@@ -41,11 +41,12 @@ class CheckYoctoCompat(BitbakeShellCommand):
 
          layerversioncore = int(self.getProperty("layerversion_core", "0"))
          # yocto-compat-layer-wrapper was introduced in Pyro
+        # it was renamed to yocto-check-layer-wrapper Rocko
          if layerversioncore >= 10:
              command = ". ./oe-init-build-env;"
              for layer in self.layers:
                  layerpath = os.path.join(builddir, layer)
-                cmd = "yocto-compat-layer-wrapper {}".format(layerpath)
+                cmd = "yocto-check-layer-wrapper {}".format(layerpath)

This will result in failures on Pyro (layer version 10). We should either:
a) bump the layer version check to only run this for Rocko (layer version 11)
b) use different program names for layer version 10 vs. layer version 11.

I'm inclined to suggest a, the yocto-compat-layer scripts only really became useful in the Rocko cycle.

Quoted 4 lines
lib/python2.7/site-packages/autobuilder/buildsteps/CheckYoctoCompat.py +0 -0
                  cmd = cmd + " || export CL_FAIL=1;"
                  command = command + cmd
              command = command + 'if [ "$CL_FAIL" = "1" ]; then exit 1; fi;'
#2 lore raw
Quoted 28 lines · Joshua Lock
Quoted 25 lines · Stephano Cetola

This script name was changed in the following commit:

b46e05677b342df44829ffe8bcfbfc954e906030

This patch updates the script name to match.

[YOCTO #12110]

---

lib/python2.7/site-packages/autobuilder/buildsteps/CheckYoctoCompat.py | 3 ++-

  1 file changed, 2 insertions(+), 1 deletion(-)
lib/python2.7/site-packages/autobuilder/buildsteps/CheckYoctoCompat.py +0 -1
index 134adaa51..62eddae50 100644
--- 

a/lib/python2.7/site-packages/autobuilder/buildsteps/CheckYoctoCompat.py
+++
b/lib/python2.7/site-packages/autobuilder/buildsteps/CheckYoctoCompat.py

lib/python2.7/site-packages/autobuilder/buildsteps/CheckYoctoCompat.py +1 -0
@@ -41,11 +41,12 @@ class CheckYoctoCompat(BitbakeShellCommand):
           layerversioncore = int(self.getProperty("layerversion_core", "0"))
           # yocto-compat-layer-wrapper was introduced in Pyro
+        # it was renamed to yocto-check-layer-wrapper Rocko

          if layerversioncore >= 10:

Quoted 8 lines
Quoted 5 lines

              command = ". ./oe-init-build-env;"
              for layer in self.layers:
                  layerpath = os.path.join(builddir, layer) -                cmd = "yocto-compat-layer-wrapper {}".format(layerpath) +                cmd = "yocto-check-layer-wrapper {}".format(layerpath)

This will result in failures on Pyro (layer version 10). We should either:
a) bump the layer version check to only run this for Rocko (layer version 11)

I went ahead and merged it with this change.

Joshua

Quoted 9 lines

b) use different program names for layer version 10 vs. layer version 11.

I'm inclined to suggest a, the yocto-compat-layer scripts only really became useful in the Rocko cycle.

Quoted 4 lines

                  cmd = cmd + " || export CL_FAIL=1;"
                  command = command + cmd
              command = command + 'if [ "$CL_FAIL" = "1" ]; then exit 1; fi;'