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:52:42 +0100 |
commit | d349e4b75ebecc6a2b4f7326de618dd1871b572b (patch) | |
tree | 8277eaeb8b41329a1d81dfc200e3f1eed005bcba | |
parent | ee68ae307fd951b9de6b31dc6713ea29186b7749 (diff) | |
download | poky-d349e4b75ebecc6a2b4f7326de618dd1871b572b.tar.gz |
toaster: Fix broken overrides usage
This fixes data corruption issues with toaster where image data wasn't
being processed correct.
(From OE-Core rev: 47015d6bf767201708b7c7cd5dd06d541c284036)
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): | |||
101 | for line in fin: | 101 | for line in fin: |
102 | try: | 102 | try: |
103 | kn, kv = line.strip().split(": ", 1) | 103 | kn, kv = line.strip().split(": ", 1) |
104 | m = re.match(r"^PKG_([^A-Z:]*)", kn) | 104 | m = re.match(r"^PKG:([^A-Z:]*)", kn) |
105 | if m: | 105 | if m: |
106 | pkgdata['OPKGN'] = m.group(1) | 106 | pkgdata['OPKGN'] = m.group(1) |
107 | kn = "_".join([x for x in kn.split("_") if x.isupper()]) | 107 | kn = kn.split(":")[0] |
108 | pkgdata[kn] = kv.strip() | 108 | pkgdata[kn] = kv |
109 | if kn.startswith('FILES_INFO'): | 109 | if kn.startswith('FILES_INFO'): |
110 | pkgdata[kn] = json.loads(kv) | 110 | pkgdata[kn] = json.loads(kv) |
111 | 111 | ||