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:51:49 +0100 |
| commit | fbbb689c8df7f82644b8a9bc5bb6884bc6516660 (patch) | |
| tree | 8f9a83cde5db42aae4074f7bf45b019aa092565a | |
| parent | 4011526ad7b2c8711038c1729c7fd046cf852ffb (diff) | |
| download | openembedded-core-contrib-fbbb689c8df7f82644b8a9bc5bb6884bc6516660.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 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass index 9518ddf7a4..f365c09142 100644 --- a/meta/classes/toaster.bbclass +++ b/meta/classes/toaster.bbclass @@ -101,12 +101,12 @@ 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() - if kn == 'FILES_INFO': + kn = kn.split(":")[0] + pkgdata[kn] = kv + if kn.startswith('FILES_INFO'): pkgdata[kn] = json.loads(kv) except ValueError: |