[yocto] [autobuilder][PATCH 2/2] BuildImages.py: Make -w flag depend on bitbake version check

[Saul Wold]

Brendan,

Just a heads up, these AB patches will be reviewed when Beth comes back 
in just over 3 weeks, you should be able to fix your local AB instance 
for now.

Thanks for your patience

Sau!


On 01/21/2015 03:08 AM, brendan.le.foll at intel.com wrote:
> From: Brendan Le Foll <brendan.le.foll at intel.com>
>
> Because bitbake -w flag does not exist in verisons of bitbake prior to 1.25
> BuildImages.py is broken for anything older like daisy, adding this check means
> that -w will only be applied if the GetBitbakeVersion step has been run.
>
> Signed-off-by: Brendan Le Foll <brendan.le.foll at intel.com>
> ---
>   lib/python2.7/site-packages/autobuilder/buildsteps/BuildImages.py | 7 ++++++-
>   1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/lib/python2.7/site-packages/autobuilder/buildsteps/BuildImages.py b/lib/python2.7/site-packages/autobuilder/buildsteps/BuildImages.py
> index 31a29a8..bf1ac5e 100644
> --- a/lib/python2.7/site-packages/autobuilder/buildsteps/BuildImages.py
> +++ b/lib/python2.7/site-packages/autobuilder/buildsteps/BuildImages.py
> @@ -13,6 +13,7 @@ __email__ = "elizabeth.flanagan at intel.com"
>
>   from buildbot.steps.shell import ShellCommand
>   from buildbot.process.buildstep import LogLineObserver
> +from distutils.version import StrictVersion
>   import os
>
>   class BuildImages(ShellCommand):
> @@ -47,7 +48,11 @@ class BuildImages(ShellCommand):
>           if self.layerversion_yoctobsp is not None and int(self.layerversion_yoctobsp) < 2 and self.machine is not None and self.machine == "genericx86-64":
>               self.command = "echo 'Skipping Step.'"
>           else:
> -            self.command = ". ./oe-init-build-env; bitbake -w -k " + self.images
> +            bitbakeflags = "-k "
> +            # -w only exists in bitbake 1.25 and newer, use distroversion string and make sure we're on poky >1.7
> +            if self.getProperty('bitbakeversion') and StrictVersion(self.getProperty('bitbakeversion')) >= StrictVersion("1.25"):
> +                bitbakeflags += "-w "
> +            self.command = ". ./oe-init-build-env; bitbake " + bitbakeflags + self.images
>               self.description = ["Building " + str(self.images)]
>           ShellCommand.start(self)
>
>