aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnrico Scholz <enrico.scholz@ensc.de>2017-09-08 19:33:01 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-05 22:39:19 +0000
commitaa367a3583f6e1fb0e55f7ec46ddad13291f1c6f (patch)
treec7a8edb944423627ea12b42cfc3a0bcb48768996
parente8112536055e75dff43369395a6cf6ba44ba8db7 (diff)
downloadopenembedded-core-aa367a3583f6e1fb0e55f7ec46ddad13291f1c6f.zip
openembedded-core-aa367a3583f6e1fb0e55f7ec46ddad13291f1c6f.tar.gz
openembedded-core-aa367a3583f6e1fb0e55f7ec46ddad13291f1c6f.tar.bz2
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) 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>
-rw-r--r--scripts/lib/wic/utils/misc.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/wic/utils/misc.py b/scripts/lib/wic/utils/misc.py
index 4609984..37e0ad6 100644
--- a/scripts/lib/wic/utils/misc.py
+++ b/scripts/lib/wic/utils/misc.py
@@ -153,7 +153,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.