diff options
| author | Enrico Scholz <enrico.scholz@ensc.de> | 2017-09-08 19:33:01 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-17 23:38:07 +0100 |
| commit | 2a69250abf61e51f633033ddb672e8f459191899 (patch) | |
| tree | 0456f1d29c498ceadd5812c7ebd9759a68bdfd6d | |
| parent | a15ec979910a74d4490aecf30aa21fa5c2f4e99d (diff) | |
| download | openembedded-core-2a69250abf61e51f633033ddb672e8f459191899.tar.gz openembedded-core-2a69250abf61e51f633033ddb672e8f459191899.tar.bz2 openembedded-core-2a69250abf61e51f633033ddb672e8f459191899.zip | |
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)
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>
| -rw-r--r-- | scripts/lib/wic/misc.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/wic/misc.py b/scripts/lib/wic/misc.py index 4e07cd659c..0792480f86 100644 --- a/scripts/lib/wic/misc.py +++ b/scripts/lib/wic/misc.py @@ -183,7 +183,7 @@ class BitbakeVars(defaultdict): self.default_image = None self.vars_dir = None - def _parse_line(self, line, image, matcher=re.compile(r"^(\w+)=(.+)")): + def _parse_line(self, line, image, matcher=re.compile(r"^([a-zA-Z0-9\-_+./~]+)=(.*)")): """ Parse one line from bitbake -e output or from .env file. Put result key-value pair into the storage. |