diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-08 10:35:16 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-08 10:38:36 +0000 |
commit | 2e26745a134373dfde3aa2b16fef3df720436e77 (patch) | |
tree | 44af3f3779c9fed7ac1db75f6724ce397d1df477 | |
parent | 97d44bf526080c31188dfb5b0e0ffcd05a15455a (diff) | |
download | poky-2e26745a134373dfde3aa2b16fef3df720436e77.tar.gz |
bitbake: ast: Add error when trying to use dash in sh function names
A dash character is illegal in function names in sh (but not bash). Since
our shell tasks run under sh and the shell parser is sh based, EXPORT_FUNCTIONS
won't work with class names containing a dash.
We can't change sh, we can ensure the user is warned about the problem
straight away though.
[YOCTO #7006]
(Bitbake rev: 86704281b79e524dccccc88cbf996b299b33bae2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | bitbake/lib/bb/parse/ast.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py index af42a0c0d6..879c9d28f8 100644 --- a/bitbake/lib/bb/parse/ast.py +++ b/bitbake/lib/bb/parse/ast.py | |||
@@ -226,6 +226,8 @@ class ExportFuncsNode(AstNode): | |||
226 | if data.getVarFlag(calledfunc, "python"): | 226 | if data.getVarFlag(calledfunc, "python"): |
227 | data.setVar(func, " bb.build.exec_func('" + calledfunc + "', d)\n") | 227 | data.setVar(func, " bb.build.exec_func('" + calledfunc + "', d)\n") |
228 | else: | 228 | else: |
229 | if "-" in self.classname: | ||
230 | bb.fatal("The classname %s contains a dash character and is calling an sh function %s using EXPORT_FUNCTIONS. Since a dash is illegal in sh function names, this cannot work, please rename the class or don't use EXPORT_FUNCTIONS." % (self.classname, calledfunc)) | ||
229 | data.setVar(func, " " + calledfunc + "\n") | 231 | data.setVar(func, " " + calledfunc + "\n") |
230 | data.setVarFlag(func, 'export_func', '1') | 232 | data.setVarFlag(func, 'export_func', '1') |
231 | 233 | ||