diff options
author | Markus Lehtonen <markus.lehtonen@linux.intel.com> | 2017-04-27 11:17:33 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-16 14:08:28 +0100 |
commit | ef8c15852cecb467cd2ebbec11b4df4bdd21ab68 (patch) | |
tree | 00a72f01c7b34cfd1db0957a73f30650fc2d348a /meta/lib/oeqa/utils/metadata.py | |
parent | a11e87f179409d7f8581db73f636190e428ae849 (diff) | |
download | poky-ef8c15852cecb467cd2ebbec11b4df4bdd21ab68.tar.gz |
oe.lsb: add get_os_release()
Move get_os_release() from oeqa.utils.metadata to oe.lsb, merging the
code with release_dict_osr() from oe.lsb. This removes some code
duplication and makes get_os_release() more robust.
(From OE-Core rev: 56b883f7765f6bd72e83dec26a5db8c7108c835d)
Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/utils/metadata.py')
-rw-r--r-- | meta/lib/oeqa/utils/metadata.py | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/meta/lib/oeqa/utils/metadata.py b/meta/lib/oeqa/utils/metadata.py index cb81155e54..65bbdc61f4 100644 --- a/meta/lib/oeqa/utils/metadata.py +++ b/meta/lib/oeqa/utils/metadata.py | |||
@@ -10,19 +10,9 @@ from collections.abc import MutableMapping | |||
10 | from xml.dom.minidom import parseString | 10 | from xml.dom.minidom import parseString |
11 | from xml.etree.ElementTree import Element, tostring | 11 | from xml.etree.ElementTree import Element, tostring |
12 | 12 | ||
13 | from oe.lsb import get_os_release | ||
13 | from oeqa.utils.commands import runCmd, get_bb_vars | 14 | from oeqa.utils.commands import runCmd, get_bb_vars |
14 | 15 | ||
15 | def get_os_release(): | ||
16 | """Get info from /etc/os-release as a dict""" | ||
17 | data = OrderedDict() | ||
18 | os_release_file = '/etc/os-release' | ||
19 | if not os.path.exists(os_release_file): | ||
20 | return None | ||
21 | with open(os_release_file) as fobj: | ||
22 | for line in fobj: | ||
23 | key, value = line.split('=', 1) | ||
24 | data[key.strip().lower()] = value.strip().strip('"') | ||
25 | return data | ||
26 | 16 | ||
27 | def metadata_from_bb(): | 17 | def metadata_from_bb(): |
28 | """ Returns test's metadata as OrderedDict. | 18 | """ Returns test's metadata as OrderedDict. |
@@ -45,9 +35,9 @@ def metadata_from_bb(): | |||
45 | os_release = get_os_release() | 35 | os_release = get_os_release() |
46 | if os_release: | 36 | if os_release: |
47 | info_dict['host_distro'] = OrderedDict() | 37 | info_dict['host_distro'] = OrderedDict() |
48 | for key in ('id', 'version_id', 'pretty_name'): | 38 | for key in ('ID', 'VERSION_ID', 'PRETTY_NAME'): |
49 | if key in os_release: | 39 | if key in os_release: |
50 | info_dict['host_distro'][key] = os_release[key] | 40 | info_dict['host_distro'][key.lower()] = os_release[key] |
51 | 41 | ||
52 | info_dict['layers'] = get_layers(data_dict['BBLAYERS']) | 42 | info_dict['layers'] = get_layers(data_dict['BBLAYERS']) |
53 | info_dict['bitbake'] = git_rev_info(os.path.dirname(bb.__file__)) | 43 | info_dict['bitbake'] = git_rev_info(os.path.dirname(bb.__file__)) |