summaryrefslogtreecommitdiffstats
path: root/scripts/lib/wic/misc.py
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-09-18 11:07:29 +0100
commit7324bc16a2cd906c255214d85aff2e555e86ce59 (patch)
tree76e53e9ad8d3124fce7bdbe8b123b1f2a88054ed /scripts/lib/wic/misc.py
parentce57a391af3c4b7c9c91a65a82eb604a2665e910 (diff)
downloadpoky-7324bc16a2cd906c255214d85aff2e555e86ce59.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) 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>
Diffstat (limited to 'scripts/lib/wic/misc.py')
-rw-r--r--scripts/lib/wic/misc.py2
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):
183 self.default_image = None 183 self.default_image = None
184 self.vars_dir = None 184 self.vars_dir = None
185 185
186 def _parse_line(self, line, image, matcher=re.compile(r"^(\w+)=(.+)")): 186 def _parse_line(self, line, image, matcher=re.compile(r"^([a-zA-Z0-9\-_+./~]+)=(.*)")):
187 """ 187 """
188 Parse one line from bitbake -e output or from .env file. 188 Parse one line from bitbake -e output or from .env file.
189 Put result key-value pair into the storage. 189 Put result key-value pair into the storage.