[PATCH 0/1] [SUMO] toaster: fix bitbake flexible path error from Bugzilla #12891

[PATCH 0/1] [SUMO] toaster: fix bitbake flexible path error from Bugzilla #12891

[David Reyna]

From: David Reyna <David.Reyna@windriver.com>

Summary:
In the previous patch that implemented flexable bitbake paths, a old definition
of the bitbake path was left in the code, undoing the functionality. This patch
addresses that error.

The following changes since commit 3b8dc3a88e28546100a6b0b2f2cc37f44e619371:

  glibc: fix CVE-2018-11237 (2018-09-27 12:17:46 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib dreyna/toaster/fix_bitbake_path_12942
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=dreyna/toaster/fix_bitbake_path_12942

Awais Belal (1):
  toaster: [Sumo] fix bitbake flexible path error from Bugzilla #12891

 lib/toaster/bldcontrol/localhostbecontroller.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
1.9.1

[PATCH 1/1] [SUMO] toaster: [Sumo] fix bitbake flexible path error from Bugzilla #12891

[David Reyna]

From: Awais Belal <awais_belal@mentor.com>

Commit 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
bitbake definition which made the earlier implementation meaningless
by reassigning the path relative to oe-core/meta.

[YOCTO #12942]

Signed-off-by: Awais Belal <awais_belal@mentor.com>
Signed-off-by: David Reyna <David.Reyna@windriver.com>
---
 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(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,
-- 
1.9.1

Re: [PATCH 0/1] [SUMO] toaster: fix bitbake flexible path error from Bugzilla #12891

[akuster808]

On 09/30/2018 12:30 AM, David Reyna wrote:
> From: David Reyna <David.Reyna@windriver.com>
>
> Summary:
> In the previous patch that implemented flexable bitbake paths, a old definition
> of the bitbake path was left in the code, undoing the functionality. This patch
> addresses that error.

yep, this applied cleanly.

thanks,
Armin
>
> The following changes since commit 3b8dc3a88e28546100a6b0b2f2cc37f44e619371:
>
>   glibc: fix CVE-2018-11237 (2018-09-27 12:17:46 +0100)
>
> are available in the git repository at:
>
>   git://git.yoctoproject.org/poky-contrib dreyna/toaster/fix_bitbake_path_12942
>   http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=dreyna/toaster/fix_bitbake_path_12942
>
> Awais Belal (1):
>   toaster: [Sumo] fix bitbake flexible path error from Bugzilla #12891
>
>  lib/toaster/bldcontrol/localhostbecontroller.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>

Re: [PATCH 0/1] [SUMO] toaster: fix bitbake flexible path error from Bugzilla #12891

[Belal, Awais]

>> yep, this applied cleanly.

>> thanks,
>> Armin

Thanks a lot David and Armin.

BR,
Awais

________________________________________
From: bitbake-devel-bounces@lists.openembedded.org <bitbake-devel-bounces@lists.openembedded.org> on behalf of akuster808 <akuster808@gmail.com>
Sent: Sunday, September 30, 2018 10:09 PM
To: David Reyna; bitbake-devel@lists.openembedded.org
Subject: Re: [bitbake-devel] [PATCH 0/1] [SUMO] toaster: fix bitbake flexible path error from Bugzilla #12891

On 09/30/2018 12:30 AM, David Reyna wrote:
> From: David Reyna <David.Reyna@windriver.com>
>
> Summary:
> In the previous patch that implemented flexable bitbake paths, a old definition
> of the bitbake path was left in the code, undoing the functionality. This patch
> addresses that error.

yep, this applied cleanly.

thanks,
Armin
>
> The following changes since commit 3b8dc3a88e28546100a6b0b2f2cc37f44e619371:
>
>   glibc: fix CVE-2018-11237 (2018-09-27 12:17:46 +0100)
>
> are available in the git repository at:
>
>   git://git.yoctoproject.org/poky-contrib dreyna/toaster/fix_bitbake_path_12942
>   http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=dreyna/toaster/fix_bitbake_path_12942
>
> Awais Belal (1):
>   toaster: [Sumo] fix bitbake flexible path error from Bugzilla #12891
>
>  lib/toaster/bldcontrol/localhostbecontroller.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>

--
_______________________________________________
bitbake-devel mailing list
bitbake-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/bitbake-devel