diff options
| author | Simon Glass <sjg@chromium.org> | 2014-08-28 09:43:40 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2014-09-05 13:40:42 -0600 |
| commit | f60c9d4f39f8ca8948594a773eee43543ca37807 (patch) | |
| tree | 026551e23342813f86850493c148681ca151b52d | |
| parent | 2c3deb9758c5be1c590bebdd25d8a36d486ea5e9 (diff) | |
| download | u-boot-f60c9d4f39f8ca8948594a773eee43543ca37807.tar.gz u-boot-f60c9d4f39f8ca8948594a773eee43543ca37807.tar.bz2 u-boot-f60c9d4f39f8ca8948594a773eee43543ca37807.zip | |
buildman: Allow make-flags variables to include '-' and '_'
These characters are commonly used in variables, so permit them. Also
document the permitted characters.
Reported-by: Tom Rini <trini@ti.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | tools/buildman/README | 4 | ||||
| -rw-r--r-- | tools/buildman/toolchain.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/tools/buildman/README b/tools/buildman/README index d20508f089..68465b46d9 100644 --- a/tools/buildman/README +++ b/tools/buildman/README @@ -670,7 +670,9 @@ snapper9g45=${at91-boards} BUILD_TAG=443 This will use 'make ENABLE_AT91_TEST=1 BUILD_TAG=442' for snapper9260 and 'make ENABLE_AT91_TEST=1 BUILD_TAG=443' for snapper9g45. A special variable ${target} is available to access the target name (snapper9260 and -snapper9g20 in this case). Variables are resolved recursively. +snapper9g20 in this case). Variables are resolved recursively. Note that +variables can only contain the characters A-Z, a-z, 0-9, hyphen (-) and +underscore (_). It is expected that any variables added are dealt with in U-Boot's config.mk file and documented in the README. diff --git a/tools/buildman/toolchain.py b/tools/buildman/toolchain.py index 1b9771f8e6..0e9129437f 100644 --- a/tools/buildman/toolchain.py +++ b/tools/buildman/toolchain.py @@ -198,7 +198,7 @@ class Toolchains: >>> tcs.ResolveReferences(var_dict, 'this=${oblique}_set${first}nd') 'this=OBLIQUE_setfi2ndrstnd' """ - re_var = re.compile('(\$\{[a-z0-9A-Z]{1,}\})') + re_var = re.compile('(\$\{[-_a-z0-9A-Z]{1,}\})') while True: m = re_var.search(args) |