summaryrefslogtreecommitdiffstats
path: root/meta/classes/toaster.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-03-19 23:00:15 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-03-21 10:07:37 +0000
commit95cc2d041ad651cfb81b2e55251acf1b86f9ddfc (patch)
tree4b6bce1833c771d07a6770b7e7ffac936d69b86b /meta/classes/toaster.bbclass
parent25d6bf8079797906bde7c0cf63a0466c981ba5bb (diff)
downloadopenembedded-core-contrib-95cc2d041ad651cfb81b2e55251acf1b86f9ddfc.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>
Diffstat (limited to 'meta/classes/toaster.bbclass')
-rw-r--r--meta/classes/toaster.bbclass6
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)