From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 3EB39E008A7; Wed, 21 Jan 2015 14:51:46 -0800 (PST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high * trust * [134.134.136.20 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 25C8BE0084E for ; Wed, 21 Jan 2015 14:51:33 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP; 21 Jan 2015 14:51:32 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.09,444,1418112000"; d="scan'208";a="665488856" Received: from unknown (HELO swold-mobl5.amr.corp.intel.com) ([10.252.252.118]) by fmsmga002.fm.intel.com with ESMTP; 21 Jan 2015 14:51:31 -0800 Message-ID: <54C02D72.9050606@linux.intel.com> Date: Wed, 21 Jan 2015 14:51:30 -0800 From: Saul Wold User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: brendan.le.foll@intel.com, yocto@yoctoproject.org References: <1421838509-29830-1-git-send-email-brendan.le.foll@intel.com> <1421838509-29830-2-git-send-email-brendan.le.foll@intel.com> In-Reply-To: <1421838509-29830-2-git-send-email-brendan.le.foll@intel.com> Subject: Re: [autobuilder][PATCH 2/2] BuildImages.py: Make -w flag depend on bitbake version check X-BeenThere: yocto@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Discussion of all things Yocto Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Jan 2015 22:51:46 -0000 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit 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@intel.com wrote: > From: Brendan Le Foll > > 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 > --- > 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@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) > >