From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay1.mentorg.com (relay1.mentorg.com [192.94.38.131]) by mail.openembedded.org (Postfix) with ESMTP id 653E8745AD for ; Thu, 27 Sep 2018 07:54:14 +0000 (UTC) Received: from nat-ies.mentorg.com ([192.94.31.2] helo=svr-ies-mbx-01.mgc.mentorg.com) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1g5R7m-0000Ss-3i from Awais_Belal@mentor.com ; Thu, 27 Sep 2018 00:54:14 -0700 Received: from SVR-IES-MBX-03.mgc.mentorg.com (139.181.222.3) by svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Thu, 27 Sep 2018 08:54:10 +0100 Received: from SVR-IES-MBX-03.mgc.mentorg.com ([fe80::1072:fb6e:87f1:ed17]) by SVR-IES-MBX-03.mgc.mentorg.com ([fe80::1072:fb6e:87f1:ed17%22]) with mapi id 15.00.1320.000; Thu, 27 Sep 2018 08:54:10 +0100 From: "Belal, Awais" To: "Reyna, David" , "bitbake-devel@lists.openembedded.org" Thread-Topic: [bitbake-devel] [sumo][PATCH] toaster: localhostbecontroller: fix bitbake path resolution Thread-Index: AQHUS0UdM8G0xVWi7EeQqAsalTR7hKTvXz/wgAl59yqACvwpbQ== Date: Thu, 27 Sep 2018 07:54:10 +0000 Message-ID: <1538034849901.46023@mentor.com> References: <1536831336527.93802@mentor.com>, <5E53D14CE4667A45B9A06760DE5D13D0F3AC15D6@ALA-MBD.corp.ad.wrs.com>, <1537430385445.98207@mentor.com> In-Reply-To: <1537430385445.98207@mentor.com> Accept-Language: en-US, en-IE X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [137.202.0.90] MIME-Version: 1.0 Subject: Re: [sumo][PATCH] toaster: localhostbecontroller: fix bitbake path resolution X-BeenThere: bitbake-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussion that advance bitbake development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Sep 2018 07:54:14 -0000 Content-Language: en-US Content-Type: multipart/alternative; boundary="_000_153803484990146023mentorcom_" --_000_153803484990146023mentorcom_ Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable >> I recommend this for both Sumo and for master as well, so that they stay= in sync. Any thoughts here? BR, Awais ________________________________ From: bitbake-devel-bounces@lists.openembedded.org on behalf of Belal, Awais Sent: Thursday, September 20, 2018 12:59 PM To: Reyna, David; bitbake-devel@lists.openembedded.org Subject: Re: [bitbake-devel] [sumo][PATCH] toaster: localhostbecontroller: = fix bitbake path resolution ping! BR, Awais ________________________________ From: Reyna, David Sent: Friday, September 14, 2018 12:18 PM To: Belal, Awais; bitbake-devel@lists.openembedded.org Cc: akuster (akuster@mvista.com) Subject: RE: [bitbake-devel] [sumo][PATCH] toaster: localhostbecontroller: = fix bitbake path resolution Hi all, I recommend this for both Sumo and for master as well, so that they stay in= sync. The cherry-pick should be clean between the two branches. - David From: bitbake-devel-bounces@lists.openembedded.org [mailto:bitbake-devel-bo= unces@lists.openembedded.org] On Behalf Of Belal, Awais Sent: Thursday, September 13, 2018 2:36 AM To: bitbake-devel@lists.openembedded.org Subject: [bitbake-devel] [sumo][PATCH] toaster: localhostbecontroller: fix = bitbake path resolution >From b736703a9d3f3c33e2e83ecd5e61dbddd5793cc8 Mon Sep 17 00:00:00 2001 From: Awais Belal Date: Thu, 13 Sep 2018 14:12:18 +0500 Subject: [sumo][PATCH] toaster: localhostbecontroller: fix bitbake path res= olution 15340edce23e63b060c75114d508e1f76757239c introduced a way which allowed bitbake to be found from the PATH variable when directory structures different from poky are used. This just drops a leftover which made the earlier implementation meaningless by reassigning the path relative to oe-core/meta. Signed-off-by: Awais Belal --- lib/toaster/bldcontrol/localhostbecontroller.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/toaster/bldcontrol/localhostbecontroller.py b/lib/toaster/= bldcontrol/localhostbecontroller.py index 3850334..63b4187 100644 --- a/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/lib/toaster/bldcontrol/localhostbecontroller.py @@ -360,12 +360,12 @@ class LocalhostBEController(BuildEnvironmentControlle= r): for path in os.environ["PATH"].split(os.pathsep): if os.path.exists(os.path.join(path, 'bitbake')): bitbake =3D os.path.join(path, 'bitbake') + logger.info("Found Bitbake at: %s" % path) break else: logger.error("Looks like Bitbake is not available, please = fix your environment") # run bitbake server from the clone - bitbake =3D os.path.join(self.pokydirname, 'bitbake', 'bin', 'bitb= ake') toasterlayers =3D os.path.join(builddir,"conf/toaster-bblayers.con= f") self._shellcmd('%s bash -c \"source %s %s; BITBAKE_UI=3D"knotty" %= s --read %s --read %s ' '--server-only -B 0.0.0.0:0\"' % (env_clean, oe_ini= t, -- 2.7.4 BR, Awais --_000_153803484990146023mentorcom_ Content-Type: text/html; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable

>> I recommend this for both Sum= o and for master as well, so that they stay in sync.

Any thoughts here?



BR,
Awais
From: bitbake-devel-bounc= es@lists.openembedded.org <bitbake-devel-bounces@lists.openembedded.org&= gt; on behalf of Belal, Awais
Sent: Thursday, September 20, 2018 12:59 PM
To: Reyna, David; bitbake-devel@lists.openembedded.org
Subject: Re: [bitbake-devel] [sumo][PATCH] toaster: localhostbecontr= oller: fix bitbake path resolution
 

ping!


BR,
Awais
From: Reyna, David <da= vid.reyna@windriver.com>
Sent: Friday, September 14, 2018 12:18 PM
To: Belal, Awais; bitbake-devel@lists.openembedded.org
Cc: akuster (akuster@mvista.com)
Subject: RE: [bitbake-devel] [sumo][PATCH] toaster: localhostbecontr= oller: fix bitbake path resolution
 

Hi all,

 

I recommend this for bo= th Sumo and for master as well, so that they stay in sync.

 

The cherry-pick should = be clean between the two branches.

 

- David

 

From: bitbak= e-devel-bounces@lists.openembedded.org [mailto:bitbake-devel-bounces@lists.= openembedded.org] On Behalf Of Belal, Awais
Sent: Thursday, September 13, 2018 2:36 AM
To: bitbake-devel@lists.openembedded.org
Subject: [bitbake-devel] [sumo][PATCH] toaster: localhostbecontrolle= r: fix bitbake path resolution

 

From b736703a9d3f3c33e2e83ecd5e61dbddd5793cc8 = Mon Sep 17 00:00:00 2001
From: Awais Belal <awais_belal@mentor.com>
Date: Thu, 13 Sep 2018 14:12:18 +0500
Subject: [sumo][PATCH] toaster: localhostbecontroller: fix bitbake path res= olution

 

15340edce23e63b060c75114d508e1f76757239c intro= duced a way which
allowed bitbake to be found from the PATH variable when directory
structures different from poky are used. This just drops a leftover
which made the earlier implementation meaningless by reassigning
the path relative to oe-core/meta.

 

Signed-off-by: Awais Belal <awais_belal@men= tor.com>
---
 lib/toaster/bldcontrol/localhostbecontroller.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

 

diff --git a/li= b/toaster/bldcontrol/localhostbecontroller.py b/lib/toaster/bldcontrol/loca= lhostbecontroller.py
index 3850334..63b4187 100644
--- a/lib/toaster/bldcontrol/localhostbecontroller.py
+++ b/lib/toaster/bldcontrol/localhostbecontroller.py
@@ -360,12 +360,12 @@ class LocalhostBEController(BuildEnvironmentContr= oller):
             fo= r path in os.environ["PATH"].split(os.pathsep):
            &nb= sp;    if os.path.exists(os.path.join(path, 'bitbake')):
            &nb= sp;        bitbake =3D os.path.join(path= , 'bitbake')
+           &nbs= p;        logger.info("Found Bitbak= e at: %s" % path)
            &nb= sp;        break
             el= se:
            &nb= sp;    logger.error("Looks like Bitbake is not availabl= e, please fix your environment")
 
         # run bitbake server from = the clone
-        bitbake =3D os.path.join(self.p= okydirname, 'bitbake', 'bin', 'bitbake')
         toasterlayers =3D os.path.= join(builddir,"conf/toaster-bblayers.conf")
         self._shellcmd('%s bash -c= \"source %s %s; BITBAKE_UI=3D"knotty" %s --read %s --read %= s '
            &nb= sp;           '--server-o= nly -B 0.0.0.0:0\"' % (env_clean, oe_init,
--
2.7.4

 

BR,

Awais

--_000_153803484990146023mentorcom_--