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>
This commit is contained in:
parent
c458f2867e
commit
448d0be779
|
@ -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.
|
||||
|
|
Loading…
Reference in New Issue