diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-19 23:00:15 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-04-05 16:41:27 +0100 |
| commit | 47015d6bf767201708b7c7cd5dd06d541c284036 (patch) | |
| tree | 04b1d66e018e827361837bb6e874d39c6a5b6d43 | |
| parent | ebca8f3ac9372b7ebb3d39e8f7f930b63b481448 (diff) | |
| download | openembedded-core-contrib-47015d6bf767201708b7c7cd5dd06d541c284036.tar.gz | |
toaster: Fix broken overrides usage
This fixes data corruption issues with toaster where image data wasn't
being processed correct.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/toaster.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass index dd5c7f224b..f365c09142 100644 --- a/meta/classes/toaster.bbclass +++ b/meta/classes/toaster.bbclass @@ -101,11 +101,11 @@ def _toaster_load_pkgdatafile(dirpath, filepath): for line in fin: try: kn, kv = line.strip().split(": ", 1) - m = re.match(r"^PKG_([^A-Z:]*)", kn) + m = re.match(r"^PKG:([^A-Z:]*)", kn) if m: pkgdata['OPKGN'] = m.group(1) - kn = "_".join([x for x in kn.split("_") if x.isupper()]) - pkgdata[kn] = kv.strip() + kn = kn.split(":")[0] + pkgdata[kn] = kv if kn.startswith('FILES_INFO'): pkgdata[kn] = json.loads(kv) |