summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Lehtonen <markus.lehtonen@linux.intel.com>2017-01-13 15:12:38 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-19 22:45:45 +0000
commit0156ef46ccf5334ee72f0202f1089249c62af37b (patch)
treefbd1e493c84b16f4b6872a8d04fa91dc87ac563a
parent98cad0b4063772dad94fea96edce1a5422256c32 (diff)
downloadopenembedded-core-contrib-0156ef46ccf5334ee72f0202f1089249c62af37b.tar.gz
openembedded-core-contrib-0156ef46ccf5334ee72f0202f1089249c62af37b.tar.bz2
openembedded-core-contrib-0156ef46ccf5334ee72f0202f1089249c62af37b.zip
oeqa.utils.metadata: re-organise distro information
Use the same format, based on /etc/os-release, as for host distro information. [YOCTO #10590] Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/lib/oeqa/utils/metadata.py17
-rwxr-xr-xscripts/oe-selftest4
2 files changed, 12 insertions, 9 deletions
diff --git a/meta/lib/oeqa/utils/metadata.py b/meta/lib/oeqa/utils/metadata.py
index 2316841e0f..df6ed91052 100644
--- a/meta/lib/oeqa/utils/metadata.py
+++ b/meta/lib/oeqa/utils/metadata.py
@@ -10,9 +10,7 @@ from collections.abc import MutableMapping
from xml.dom.minidom import parseString
from xml.etree.ElementTree import Element, tostring
-from oeqa.utils.commands import runCmd, get_bb_var, get_bb_vars
-
-metadata_vars = ['MACHINE', 'DISTRO', 'DISTRO_VERSION']
+from oeqa.utils.commands import runCmd, get_bb_vars
def get_os_release():
"""Get info from /etc/os-release as a dict"""
@@ -35,9 +33,14 @@ def metadata_from_bb():
info_dict = OrderedDict()
hostname = runCmd('hostname')
info_dict['hostname'] = hostname.output
- data_dict = get_bb_vars(metadata_vars)
- for var in metadata_vars:
- info_dict[var.lower()] = data_dict[var]
+ data_dict = get_bb_vars()
+
+ info_dict['machine'] = data_dict['MACHINE']
+
+ # Distro information
+ info_dict['distro'] = {'id': data_dict['DISTRO'],
+ 'version_id': data_dict['DISTRO_VERSION'],
+ 'pretty_name': '%s %s' % (data_dict['DISTRO'], data_dict['DISTRO_VERSION'])}
# Host distro information
os_release = get_os_release()
@@ -47,7 +50,7 @@ def metadata_from_bb():
if key in os_release:
info_dict['host_distro'][key] = os_release[key]
- info_dict['layers'] = get_layers(get_bb_var('BBLAYERS'))
+ info_dict['layers'] = get_layers(data_dict['BBLAYERS'])
return info_dict
def metadata_from_data_store(d):
diff --git a/scripts/oe-selftest b/scripts/oe-selftest
index 120a6c2de8..c3c491f20a 100755
--- a/scripts/oe-selftest
+++ b/scripts/oe-selftest
@@ -632,8 +632,8 @@ def main():
for layer, values in metadata['layers'].items():
layer_info = '%s%-17s = %s:%s\n' % (layer_info, layer,
values['branch'], values['revision'])
- msg = 'Selftest for build %s of %s %s for machine %s on %s\n\n%s' % (
- log_prefix[12:], metadata['distro'], metadata['distro_version'],
+ msg = 'Selftest for build %s of %s for machine %s on %s\n\n%s' % (
+ log_prefix[12:], metadata['distro']['pretty_name'],
metadata['machine'], metadata['hostname'], layer_info)
log.debug('Commiting results to local repository')