| Message ID | 20220319233824.1125705-1-richard.purdie@linuxfoundation.org |
|---|---|
| State | Accepted, archived |
| Commit | 95cc2d041ad651cfb81b2e55251acf1b86f9ddfc |
| Headers | show |
| Series | toaster: Fix broken overrides usage | expand |
diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass index dd5c7f224ba..f365c091420 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)
This fixes data corruption issues with toaster where image data wasn't being processed correct. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> --- meta/classes/toaster.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)