[yocto-autobuilder][PATCH] CheckYoctoCompat.py: rename yocto-compat-layer to yocto-check-layer

[yocto-autobuilder][PATCH] CheckYoctoCompat.py: rename yocto-compat-layer to yocto-check-layer

[Stephano Cetola]

This script name was changed in the following commit:

b46e05677b342df44829ffe8bcfbfc954e906030

This patch updates the script name to match.

[YOCTO #12110]

Signed-off-by: Stephano Cetola <stephano.cetola@linux.intel.com>
---
 lib/python2.7/site-packages/autobuilder/buildsteps/CheckYoctoCompat.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/CheckYoctoCompat.py b/lib/python2.7/site-packages/autobuilder/buildsteps/CheckYoctoCompat.py
index 134adaa51..62eddae50 100644
--- a/lib/python2.7/site-packages/autobuilder/buildsteps/CheckYoctoCompat.py
+++ b/lib/python2.7/site-packages/autobuilder/buildsteps/CheckYoctoCompat.py
@@ -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;'
-- 
2.14.1

Re: [yocto-autobuilder][PATCH] CheckYoctoCompat.py: rename yocto-compat-layer to yocto-check-layer

[Joshua Lock]

On 21/09/17 02:36, Stephano Cetola wrote:
> This script name was changed in the following commit:
> 
> b46e05677b342df44829ffe8bcfbfc954e906030
> 
> This patch updates the script name to match.
> 
> [YOCTO #12110]
> 
> Signed-off-by: Stephano Cetola <stephano.cetola@linux.intel.com>
> ---
>   lib/python2.7/site-packages/autobuilder/buildsteps/CheckYoctoCompat.py | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/CheckYoctoCompat.py b/lib/python2.7/site-packages/autobuilder/buildsteps/CheckYoctoCompat.py
> index 134adaa51..62eddae50 100644
> --- a/lib/python2.7/site-packages/autobuilder/buildsteps/CheckYoctoCompat.py
> +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/CheckYoctoCompat.py
> @@ -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.


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

Re: [yocto-autobuilder][PATCH] CheckYoctoCompat.py: rename yocto-compat-layer to yocto-check-layer

[Joshua Lock]

On 21/09/17 09:47, Joshua Lock wrote:
> 
> 
> On 21/09/17 02:36, Stephano Cetola wrote:
>> This script name was changed in the following commit:
>>
>> b46e05677b342df44829ffe8bcfbfc954e906030
>>
>> This patch updates the script name to match.
>>
>> [YOCTO #12110]
>>
>> Signed-off-by: Stephano Cetola <stephano.cetola@linux.intel.com>
>> ---
>>   
>> lib/python2.7/site-packages/autobuilder/buildsteps/CheckYoctoCompat.py 
>> | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git 
>> a/lib/python2.7/site-packages/autobuilder/buildsteps/CheckYoctoCompat.py 
>> b/lib/python2.7/site-packages/autobuilder/buildsteps/CheckYoctoCompat.py
>> index 134adaa51..62eddae50 100644
>> --- 
>> a/lib/python2.7/site-packages/autobuilder/buildsteps/CheckYoctoCompat.py
>> +++ 
>> b/lib/python2.7/site-packages/autobuilder/buildsteps/CheckYoctoCompat.py
>> @@ -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)

I went ahead and merged it with this change.

Joshua

> 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.
> 
> 
>>                   cmd = cmd + " || export CL_FAIL=1;"
>>                   command = command + cmd
>>               command = command + 'if [ "$CL_FAIL" = "1" ]; then exit 
>> 1; fi;'
>>