Skip to contentSkip to conversation

toaster: localhostbecontroller: fix bitbake path resolution

PATCH In review Belal, Awais 4 participants 11 messages Sep 13, 2018 – Sep 30, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 toaster: localhostbecontroller: fix bitbake path resolution

From b736703a9d3f3c33e2e83ecd5e61dbddd5793cc8 Mon Sep 17 00:00:00 2001
From: Awais Belal <[email protected]>
Date: Thu, 13 Sep 2018 14:12:18 +0500
Subject: [sumo][PATCH] toaster: localhostbecontroller: fix bitbake path resolution

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.

---
 lib/toaster/bldcontrol/localhostbecontroller.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/toaster/bldcontrol/localhostbecontroller.py +1 -1
index 3850334..63b4187 100644
@@ -360,12 +360,12 @@ class LocalhostBEController(BuildEnvironmentController):
             for path in os.environ["PATH"].split(os.pathsep):
                 if os.path.exists(os.path.join(path, 'bitbake')):
                     bitbake = 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 = os.path.join(self.pokydirname, 'bitbake', 'bin', 'bitbake')
         toasterlayers = os.path.join(builddir,"conf/toaster-bblayers.conf")
         self._shellcmd('%s bash -c \"source %s %s; BITBAKE_UI="knotty" %s --read %s --read %s '
                        '--server-only -B 0.0.0.0:0\"' % (env_clean, oe_init,

--
2.7.4

BR,
Awais

#1 lore raw

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: [email protected] [mailto:[email protected]] On Behalf Of Belal, Awais
Sent: Thursday, September 13, 2018 2:36 AM
To: [email protected]
Subject: [bitbake-devel] [sumo][PATCH] toaster: localhostbecontroller: fix bitbake path resolution

From b736703a9d3f3c33e2e83ecd5e61dbddd5793cc8 Mon Sep 17 00:00:00 2001
From: Awais Belal <[email protected]>
Date: Thu, 13 Sep 2018 14:12:18 +0500
Subject: [sumo][PATCH] toaster: localhostbecontroller: fix bitbake path resolution

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.

---
 lib/toaster/bldcontrol/localhostbecontroller.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/toaster/bldcontrol/localhostbecontroller.py +1 -1
index 3850334..63b4187 100644
@@ -360,12 +360,12 @@ class LocalhostBEController(BuildEnvironmentController):
             for path in os.environ["PATH"].split(os.pathsep):
                 if os.path.exists(os.path.join(path, 'bitbake')):
                     bitbake = 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 = os.path.join(self.pokydirname, 'bitbake', 'bin', 'bitbake')
         toasterlayers = os.path.join(builddir,"conf/toaster-bblayers.conf")
         self._shellcmd('%s bash -c \"source %s %s; BITBAKE_UI="knotty" %s --read %s --read %s '
                        '--server-only -B 0.0.0.0:0\"' % (env_clean, oe_init,

--
2.7.4

BR,
Awais

#2 lore raw

ping!

BR,
Awais
________________________________
From: Reyna, David <[email protected]>
Sent: Friday, September 14, 2018 12:18 PM
To: Belal, Awais; [email protected]
Cc: akuster ([email protected])
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: [email protected] [mailto:[email protected]] On Behalf Of Belal, Awais
Sent: Thursday, September 13, 2018 2:36 AM
To: [email protected]
Subject: [bitbake-devel] [sumo][PATCH] toaster: localhostbecontroller: fix bitbake path resolution

From b736703a9d3f3c33e2e83ecd5e61dbddd5793cc8 Mon Sep 17 00:00:00 2001
From: Awais Belal <[email protected]>
Date: Thu, 13 Sep 2018 14:12:18 +0500
Subject: [sumo][PATCH] toaster: localhostbecontroller: fix bitbake path resolution

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.

---
 lib/toaster/bldcontrol/localhostbecontroller.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/toaster/bldcontrol/localhostbecontroller.py +1 -1
index 3850334..63b4187 100644
@@ -360,12 +360,12 @@ class LocalhostBEController(BuildEnvironmentController):
             for path in os.environ["PATH"].split(os.pathsep):
                 if os.path.exists(os.path.join(path, 'bitbake')):
                     bitbake = 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 = os.path.join(self.pokydirname, 'bitbake', 'bin', 'bitbake')
         toasterlayers = os.path.join(builddir,"conf/toaster-bblayers.conf")
         self._shellcmd('%s bash -c \"source %s %s; BITBAKE_UI="knotty" %s --read %s --read %s '
                        '--server-only -B 0.0.0.0:0\"' % (env_clean, oe_init,

--
2.7.4

BR,
Awais

#3 lore raw
Quoted 1 line
Quoted 1 line

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

Any thoughts here?

BR,
Awais
________________________________
From: [email protected] <[email protected]> on behalf of Belal, Awais
Sent: Thursday, September 20, 2018 12:59 PM
To: Reyna, David; [email protected]
Subject: Re: [bitbake-devel] [sumo][PATCH] toaster: localhostbecontroller: fix bitbake path resolution

ping!

BR,
Awais
________________________________
From: Reyna, David <[email protected]>
Sent: Friday, September 14, 2018 12:18 PM
To: Belal, Awais; [email protected]
Cc: akuster ([email protected])
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: [email protected] [mailto:[email protected]] On Behalf Of Belal, Awais
Sent: Thursday, September 13, 2018 2:36 AM
To: [email protected]
Subject: [bitbake-devel] [sumo][PATCH] toaster: localhostbecontroller: fix bitbake path resolution

From b736703a9d3f3c33e2e83ecd5e61dbddd5793cc8 Mon Sep 17 00:00:00 2001
From: Awais Belal <[email protected]>
Date: Thu, 13 Sep 2018 14:12:18 +0500
Subject: [sumo][PATCH] toaster: localhostbecontroller: fix bitbake path resolution

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.

---
 lib/toaster/bldcontrol/localhostbecontroller.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/toaster/bldcontrol/localhostbecontroller.py +1 -1
index 3850334..63b4187 100644
@@ -360,12 +360,12 @@ class LocalhostBEController(BuildEnvironmentController):
             for path in os.environ["PATH"].split(os.pathsep):
                 if os.path.exists(os.path.join(path, 'bitbake')):
                     bitbake = 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 = os.path.join(self.pokydirname, 'bitbake', 'bin', 'bitbake')
         toasterlayers = os.path.join(builddir,"conf/toaster-bblayers.conf")
         self._shellcmd('%s bash -c \"source %s %s; BITBAKE_UI="knotty" %s --read %s --read %s '
                        '--server-only -B 0.0.0.0:0\"' % (env_clean, oe_init,

--
2.7.4

BR,
Awais

#4 lore raw
Quoted 3 lines · Awais
Quoted 1 line
Quoted 1 line

I recommend this for both Sumo and for master as well, so that

they stay in sync.
Any thoughts here?

I'm confused. Does master need the patch? or only sumo?

Cheers,

Richard

#5 lore raw
Quoted 1 line
Quoted 1 line

I'm confused. Does master need the patch? or only sumo?

Both.

BR,
Awais

________________________________________
From: Richard Purdie <[email protected]>
Sent: Thursday, September 27, 2018 9:53 PM
To: Belal, Awais; Reyna, David; [email protected]
Subject: Re: [bitbake-devel] [sumo][PATCH] toaster: localhostbecontroller: fix bitbake path resolution

Quoted 3 lines · Awais
Quoted 1 line
Quoted 1 line

I recommend this for both Sumo and for master as well, so that

they stay in sync.
Any thoughts here?

I'm confused. Does master need the patch? or only sumo?

Cheers,

Richard

#6 lore raw
Quoted 3 lines · Awais
Quoted 1 line
Quoted 1 line

I'm confused. Does master need the patch? or only sumo?

Both.

The patch doesn't apply to master so could you send a version which applies there please?

I can then apply the sumo one at the same time which does presumably apply to sumo (I've not tried that as yet).

Thanks,

Richard

#7 lore raw
Quoted 5 lines
Quoted 5 lines

The patch doesn't apply to master so could you send a version which applies there please?

I can then apply the sumo one at the same time which does presumably apply to sumo (I've not tried that as yet).

Extremely sorry, this is only needed for sumo (1.38), master doesn't have this problem.

BR,
Awais

________________________________________
From: [email protected] <[email protected]>
Sent: Friday, September 28, 2018 12:52 PM
To: Belal, Awais; Reyna, David; [email protected]
Subject: Re: [bitbake-devel] [sumo][PATCH] toaster: localhostbecontroller: fix bitbake path resolution

Quoted 3 lines · Awais
Quoted 1 line
Quoted 1 line

I'm confused. Does master need the patch? or only sumo?

Both.

The patch doesn't apply to master so could you send a version which applies there please?

I can then apply the sumo one at the same time which does presumably apply to sumo (I've not tried that as yet).

Thanks,

Richard

#8 lore raw
Quoted 5 lines · Awais
Quoted 4 lines
Quoted 4 lines

The patch doesn't apply to master so could you send a version which applies there please?
I can then apply the sumo one at the same time which does presumably apply to sumo (I've not tried that as yet).

Extremely sorry, this is only needed for sumo (1.38), master doesn't have this problem.

This does not apply to sumo either. We have the commit it depends on:

c1f5ec8 bitbake: toaster: use a more flexible way to find bitbake

- armin

Quoted 24 lines

BR,
Awais

________________________________________
From: [email protected] <[email protected]>
Sent: Friday, September 28, 2018 12:52 PM
To: Belal, Awais; Reyna, David; [email protected]
Subject: Re: [bitbake-devel] [sumo][PATCH] toaster: localhostbecontroller: fix bitbake path resolution

Quoted 2 lines · Awais
Quoted 1 line
Quoted 1 line

I'm confused. Does master need the patch? or only sumo?

Both.

The patch doesn't apply to master so could you send a version which applies there please?

I can then apply the sumo one at the same time which does presumably apply to sumo (I've not tried that as yet).

Thanks,

Richard

#9 lore raw

Hi all,

I created my own version of Awais's patch from my Sumo branch. The only difference was that I based by patch from the "bitbake" directory (Awais did it from the bitbake/lib" directory), plus I got an extra blank line at the end.

I am going to submit my version of the patch in a few minutes. It should look identical to the original from Awais, except for the above observations.

- David

-----Original Message-----
From: akuster808 [mailto:[email protected]]
Sent: Friday, September 28, 2018 9:09 AM
To: Belal, Awais; [email protected]; Reyna, David; [email protected]
Subject: Re: [bitbake-devel] [sumo][PATCH] toaster: localhostbecontroller: fix bitbake path resolution

Quoted 5 lines · Awais
Quoted 4 lines
Quoted 4 lines

The patch doesn't apply to master so could you send a version which applies there please?
I can then apply the sumo one at the same time which does presumably apply to sumo (I've not tried that as yet).

Extremely sorry, this is only needed for sumo (1.38), master doesn't have this problem.

This does not apply to sumo either. We have the commit it depends on:

c1f5ec8 bitbake: toaster: use a more flexible way to find bitbake

- armin

Quoted 24 lines

BR,
Awais

________________________________________
From: [email protected] <[email protected]>
Sent: Friday, September 28, 2018 12:52 PM
To: Belal, Awais; Reyna, David; [email protected]
Subject: Re: [bitbake-devel] [sumo][PATCH] toaster: localhostbecontroller: fix bitbake path resolution

Quoted 2 lines · Awais
Quoted 1 line
Quoted 1 line

I'm confused. Does master need the patch? or only sumo?

Both.

The patch doesn't apply to master so could you send a version which applies there please?

I can then apply the sumo one at the same time which does presumably apply to sumo (I've not tried that as yet).

Thanks,

Richard

#10 lore raw

Hi again,

I have submitted the patch. The patch itself looks the same to me, however I did use the official "create-pull-request" on top of the latest pull, so maybe it will have a happier apply. I also took advantage of this submission by adding a formal Bugzilla case number into the commit text.

- David

-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Reyna, David
Sent: Sunday, September 30, 2018 12:07 AM
To: akuster808; Belal, Awais; [email protected]
Cc: [email protected]
Subject: Re: [bitbake-devel] [sumo][PATCH] toaster: localhostbecontroller: fix bitbake path resolution

Hi all,

I created my own version of Awais's patch from my Sumo branch. The only difference was that I based by patch from the "bitbake" directory (Awais did it from the bitbake/lib" directory), plus I got an extra blank line at the end.

I am going to submit my version of the patch in a few minutes. It should look identical to the original from Awais, except for the above observations.

- David

-----Original Message-----
From: akuster808 [mailto:[email protected]]
Sent: Friday, September 28, 2018 9:09 AM
To: Belal, Awais; [email protected]; Reyna, David; [email protected]
Subject: Re: [bitbake-devel] [sumo][PATCH] toaster: localhostbecontroller: fix bitbake path resolution

Quoted 5 lines · Awais
Quoted 4 lines
Quoted 4 lines

The patch doesn't apply to master so could you send a version which applies there please?
I can then apply the sumo one at the same time which does presumably apply to sumo (I've not tried that as yet).

Extremely sorry, this is only needed for sumo (1.38), master doesn't have this problem.

This does not apply to sumo either. We have the commit it depends on:

c1f5ec8 bitbake: toaster: use a more flexible way to find bitbake

- armin

Quoted 24 lines

BR,
Awais

________________________________________
From: [email protected] <[email protected]>
Sent: Friday, September 28, 2018 12:52 PM
To: Belal, Awais; Reyna, David; [email protected]
Subject: Re: [bitbake-devel] [sumo][PATCH] toaster: localhostbecontroller: fix bitbake path resolution

Quoted 2 lines · Awais
Quoted 1 line
Quoted 1 line

I'm confused. Does master need the patch? or only sumo?

Both.

The patch doesn't apply to master so could you send a version which applies there please?

I can then apply the sumo one at the same time which does presumably apply to sumo (I've not tried that as yet).

Thanks,

Richard

Signature · 4 lines
_______________________________________________
bitbake-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/bitbake-devel