toaster.bbclass: save original package name

If we can get the original package name when reading
package infos in toaster.bbclass, we save it for proper
referincing in the toater ui.

(From OE-Core rev: c3f3fed1b397b6ee6d44e7d39e63d084e4a88e30)

Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass
index 7c404b9..eed30d4 100644 (file)
--- a/meta/classes/toaster.bbclass
+++ b/meta/classes/toaster.bbclass
@@ -94,11 +94,15 @@ python toaster_layerinfo_dumpdata() {
 
 def _toaster_load_pkgdatafile(dirpath, filepath):
     import json
+    import re
     pkgdata = {}
     with open(os.path.join(dirpath, filepath), "r") as fin:
         for line in fin:
             try:
                 kn, kv = line.strip().split(": ", 1)
+                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':