Skip to contentSkip to conversation

buildman: Correct toolchain download feature

PATCH New Simon Glass 2 participants 3 messages Mar 3, 2015 – Mar 5, 2015

lore
Share & tools
lore

Simon Glass

author
#0 lore raw

PATCH 1/1 buildman: Correct toolchain download feature

Commit d908898 updated the ScanPath() function but not its documentation and not all its callers.

This breaks the toolchain check after it is downloaded. Fix it.

Signed-off-by Simon Glass <[email protected]>

---

 tools/buildman/toolchain.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
tools/buildman/toolchain.py +7 -3
index 537797a..051da11 100644
@@ -465,11 +465,15 @@ class Toolchains:
         # Check that the toolchain works
         print 'Testing'
         dirpath = os.path.join(dest, path)
-        compiler_fname = self.ScanPath(dirpath, True)
-        if not compiler_fname:
+        compiler_fname_list = self.ScanPath(dirpath, True)
+        if not compiler_fname_list:
             print 'Could not locate C compiler - fetch failed.'
             return 1
-        toolchain = Toolchain(compiler_fname, True, True)
+        if len(compiler_fname_list) != 1:
+            print ('Internal error, ambiguous toolchains: %s' %
+                   (', '.join(compiler_fname)))
+            return 1
+        toolchain = Toolchain(compiler_fname_list[0], True, True)
 
         # Make sure that it will be found by buildman
         if not self.TestSettingsHasPath(dirpath):
Signature · 1 line
2.2.0.rc0.207.ga3a616c
#1 lore raw

PATCH 1/1 buildman: Correct toolchain download feature

Hello Simon,

Am 03.03.2015 01:05, schrieb Simon Glass:

Quoted 10 lines

Commit d908898 updated the ScanPath() function but not its documentation and not all its callers.

This breaks the toolchain check after it is downloaded. Fix it.

Signed-off-by Simon Glass <[email protected]>

---

  tools/buildman/toolchain.py | 10 +++++++---
  1 file changed, 7 insertions(+), 3 deletions(-)

Thanks!

Acked-by Heiko Schocher <[email protected]>

bye,
Heiko

Signature · 2 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
author
#2 lore raw

PATCH 1/1 buildman: Correct toolchain download feature

Quoted 12 lines · Heiko Schocher

Hello Simon,

Am 03.03.2015 01:05, schrieb Simon Glass:

Quoted 9 lines

Commit d908898 updated the ScanPath() function but not its documentation and not all its callers.

This breaks the toolchain check after it is downloaded. Fix it.

Signed-off-by Simon Glass <[email protected]>

---

Quoted 7 lines
Quoted 2 lines
  tools/buildman/toolchain.py | 10 +++++++---
  1 file changed, 7 insertions(+), 3 deletions(-)

Thanks!

Acked-by Heiko Schocher <[email protected]>

Applied to u-boot-x86/buildman.