From 1826a18d8dc6d9d00ba40c742aea41cbfdc47acb Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Mon, 7 Jul 2014 09:46:36 +0900 Subject: buildman: fix to display warning message for missing [toolchain] section Toolchains.__init__ is expected to display a warning message when the [toolchain] section is missing from ~/.buildman file. But it never works. In that case, instead, buildmain fails with an error message which is difficult to understand: Traceback (most recent call last): File "tools/buildman/buildman", line 126, in control.DoBuildman(options, args) File "/home/foo/u-boot/tools/buildman/control.py", line 78, in DoBuildman toolchains = toolchain.Toolchains() File "/home/foo/u-boot/tools/buildman/toolchain.py", line 106, in __init__ config_fname) NameError: global name 'config_fname' is not defined Signed-off-by: Masahiro Yamada Cc: Simon Glass Acked-by: Simon Glass --- tools/buildman/toolchain.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/buildman/toolchain.py') diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py index b64338680e..e392035ea5 100644 --- a/tools/buildman/toolchain.py +++ b/tools/buildman/toolchain.py @@ -103,7 +103,7 @@ class Toolchains: if not toolchains: print ("Warning: No tool chains - please add a [toolchain] section" " to your buildman config file %s. See README for details" % - config_fname) + bsettings.config_fname) for name, value in toolchains: if '*' in value: -- cgit From 8708267f09fa99be8c12e103f2cbdc14a43623cc Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Mon, 7 Jul 2014 09:47:45 +0900 Subject: buildman: fix toolchain priority_list '-elf' appears twice in the toolchain priority_list. The second one is rudundant. Signed-off-by: Masahiro Yamada Cc: Simon Glass Acked-by: Simon Glass --- tools/buildman/toolchain.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/buildman/toolchain.py') diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py index e392035ea5..1b9771f8e6 100644 --- a/tools/buildman/toolchain.py +++ b/tools/buildman/toolchain.py @@ -66,7 +66,7 @@ class Toolchain: Returns: Priority of toolchain, 0=highest, 20=lowest. """ - priority_list = ['-elf', '-unknown-linux-gnu', '-linux', '-elf', + priority_list = ['-elf', '-unknown-linux-gnu', '-linux', '-none-linux-gnueabi', '-uclinux', '-none-eabi', '-gentoo-linux-gnu', '-linux-gnueabi', '-le-linux', '-uclinux'] for prio in range(len(priority_list)): -- cgit