diff options
author | Enrico Scholz <enrico.scholz@ensc.de> | 2017-09-08 19:33:01 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-11-05 22:39:46 +0000 |
commit | 448d0be779833ba4297619248a772c428f4ff162 (patch) | |
tree | f431e610954f8bdaaf8a9ea3c27c42f5aa09160a | |
parent | c458f2867e1052193713d430fc2ddde62aa28b98 (diff) | |
download | poky-448d0be779833ba4297619248a772c428f4ff162.tar.gz |
wic: accept '-' in bitbake variables
'-' is valid and common in bitbake variables (e.g. 'FOO_pn-bar'). Accept
it and other characters when reading the .env file.
Also, allow variables to be empty.
(From OE-Core rev: e688ac8e92d2bc451d8b2d437596f630bedccd2c)
(From OE-Core rev: 2a69250abf61e51f633033ddb672e8f459191899)
(From OE-Core rev: aa367a3583f6e1fb0e55f7ec46ddad13291f1c6f)
Signed-off-by: Enrico Scholz <enrico.scholz@ensc.de>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | scripts/lib/wic/utils/misc.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/wic/utils/misc.py b/scripts/lib/wic/utils/misc.py index 46099840ca..37e0ad6a3d 100644 --- a/scripts/lib/wic/utils/misc.py +++ b/scripts/lib/wic/utils/misc.py | |||
@@ -153,7 +153,7 @@ class BitbakeVars(defaultdict): | |||
153 | self.default_image = None | 153 | self.default_image = None |
154 | self.vars_dir = None | 154 | self.vars_dir = None |
155 | 155 | ||
156 | def _parse_line(self, line, image, matcher=re.compile(r"^(\w+)=(.+)")): | 156 | def _parse_line(self, line, image, matcher=re.compile(r"^([a-zA-Z0-9\-_+./~]+)=(.*)")): |
157 | """ | 157 | """ |
158 | Parse one line from bitbake -e output or from .env file. | 158 | Parse one line from bitbake -e output or from .env file. |
159 | Put result key-value pair into the storage. | 159 | Put result key-value pair into the storage. |