From 3ab0aa04de7a400fd3650e00933727a7ccfc6c70 Mon Sep 17 00:00:00 2001
From: Sergei Trofimov <sergei.trofimov@arm.com>
Date: Wed, 13 Dec 2017 10:54:10 +0000
Subject: [PATCH] framework/target: fix TargetInfo deserialization

Fix TargetInfo.from_pod(). As part of creating the POD, some of devlib's
classes such as Cpuinfo, get serialized. Since they are from devlib,
they do not implement WA's serialization interface, and are instead
serialized by extracting their internal structures. They are then not
deserialized properly, since their __init__'s expect text rather than
parsed structures.

This implements deserialization functions for these classes which
initialize them properly from TargetInfo POD.
---
 wa/framework/target/info.py | 46 +++++++++++++++++++++++++++++++++----
 1 file changed, 42 insertions(+), 4 deletions(-)

diff --git a/wa/framework/target/info.py b/wa/framework/target/info.py
index c7aa921b..3c719c02 100644
--- a/wa/framework/target/info.py
+++ b/wa/framework/target/info.py
@@ -3,6 +3,45 @@ from devlib.target import KernelConfig, KernelVersion, Cpuinfo
 from devlib.utils.android import AndroidProperties
 
 
+def cpuinfo_from_pod(pod):
+    cpuinfo = Cpuinfo('')
+    cpuinfo.sections = pod['cpuinfo']
+    lines = []
+    for section in cpuinfo.sections:
+        for key, value in section.iteritems():
+            line = '{}: {}'.format(key, value)
+            lines.append(line)
+        lines.append('')
+    cpuinfo.text = '\n'.join(lines)
+    return cpuinfo
+
+
+def kernel_version_from_pod(pod):
+    release_string = pod['kernel_release']
+    version_string = pod['kernel_version']
+    if release_string:
+        if version_string:
+            kernel_string = '{} #{}'.format(release_string, version_string)
+        else:
+            kerne_string = release_string
+    else:
+        kernel_string = '#{}'.format(version_string)
+    return KernelVersion(kernel_string)
+
+
+def kernel_config_from_pod(pod):
+    config = KernelConfig('')
+    config._config = pod['kernel_config']
+    lines = []
+    for key, value in config._config.iteritems():
+        if value == 'n':
+            lines.append('# {} is not set'.format(key))
+        else:
+            lines.append('{}={}'.format(key, value))
+    config.text = '\n'.join(lines)
+    return config
+
+
 class TargetInfo(object):
 
     @staticmethod
@@ -10,14 +49,13 @@ class TargetInfo(object):
         instance = TargetInfo()
         instance.target = pod['target']
         instance.abi = pod['abi']
-        instance.cpuinfo = Cpuinfo(pod['cpuinfo'])
+        instance.cpuinfo = cpuinfo_from_pod(pod)
         instance.os = pod['os']
         instance.os_version = pod['os_version']
         instance.abi = pod['abi']
         instance.is_rooted = pod['is_rooted']
-        instance.kernel_version = KernelVersion(pod['kernel_release'], 
-                                                pod['kernel_version'])
-        instance.kernel_config = KernelConfig(pod['kernel_config'])
+        instance.kernel_version = kernel_version_from_pod(pod)
+        instance.kernel_config = kernel_config_from_pod(pod)
 
         if pod["target"] == "AndroidTarget":
             instance.screen_resolution = pod['screen_resolution']