@@ -6,9 +6,8 @@
def get_os_release():
"""Get all key-value pairs from /etc/os-release as a dict"""
- from collections import OrderedDict
- data = OrderedDict()
+ data = {}
if os.path.exists('/etc/os-release'):
with open('/etc/os-release') as f:
for line in f:
@@ -19,95 +18,16 @@ def get_os_release():
data[key.strip()] = val.strip('"\'')
return data
-def release_dict_osr():
- """ Populate a dict with pertinent values from /etc/os-release """
- data = {}
- os_release = get_os_release()
- if 'ID' in os_release:
- data['DISTRIB_ID'] = os_release['ID']
- if 'VERSION_ID' in os_release:
- data['DISTRIB_RELEASE'] = os_release['VERSION_ID']
-
- return data
-
-def release_dict_lsb():
- """ Return the output of lsb_release -ir as a dictionary """
- from subprocess import PIPE
-
- try:
- output, err = bb.process.run(['lsb_release', '-ir'], stderr=PIPE)
- except bb.process.CmdError as exc:
- return {}
-
- lsb_map = { 'Distributor ID': 'DISTRIB_ID',
- 'Release': 'DISTRIB_RELEASE'}
- lsb_keys = lsb_map.keys()
-
- data = {}
- for line in output.splitlines():
- if line.startswith("-e"):
- line = line[3:]
- try:
- key, value = line.split(":\t", 1)
- except ValueError:
- continue
- if key in lsb_keys:
- data[lsb_map[key]] = value
-
- if len(data.keys()) != 2:
- return None
-
- return data
-
-def release_dict_file():
- """ Try to gather release information manually when other methods fail """
- data = {}
- try:
- if os.path.exists('/etc/lsb-release'):
- data = {}
- with open('/etc/lsb-release') as f:
- for line in f:
- key, value = line.split("=", 1)
- data[key] = value.strip()
- elif os.path.exists('/etc/redhat-release'):
- data = {}
- with open('/etc/redhat-release') as f:
- distro = f.readline().strip()
- import re
- match = re.match(r'(.*) release (.*) \((.*)\)', distro)
- if match:
- data['DISTRIB_ID'] = match.group(1)
- data['DISTRIB_RELEASE'] = match.group(2)
- elif os.path.exists('/etc/SuSE-release'):
- data = {}
- data['DISTRIB_ID'] = 'SUSE LINUX'
- with open('/etc/SuSE-release') as f:
- for line in f:
- if line.startswith('VERSION = '):
- data['DISTRIB_RELEASE'] = line[10:].rstrip()
- break
-
- except IOError:
- return {}
- return data
-
def distro_identifier(adjust_hook=None):
- """Return a distro identifier string based upon lsb_release -ri,
+ """Return a distro identifier string based upon /etc/os-release
with optional adjustment via a hook"""
import re
- # Try /etc/os-release first, then the output of `lsb_release -ir` and
- # finally fall back on parsing various release files in order to determine
- # host distro name and version.
- distro_data = release_dict_osr()
- if not distro_data:
- distro_data = release_dict_lsb()
- if not distro_data:
- distro_data = release_dict_file()
+ distro_data = get_os_release()
- distro_id = distro_data.get('DISTRIB_ID', '')
- release = distro_data.get('DISTRIB_RELEASE', '')
+ distro_id = distro_data.get('ID')
+ release = distro_data.get('VERSION_ID')
if adjust_hook:
distro_id, release = adjust_hook(distro_id, release)
Over time, distros have standardised on providing distro name and version information via /etc/os-release. All of our currently supported distros contain this file, so we can drop support for gathering distro name and version information via other methods. Signed-off-by: Paul Barker <paul@pbarker.dev> --- meta/lib/oe/lsb.py | 90 +++--------------------------------------------------- 1 file changed, 5 insertions(+), 85 deletions(-) --- base-commit: 4f7d1a0885d7d6f2a533f7388ed5f5a35d6f99bc change-id: 20260511-os-release-cbe1a67827bf Best regards, -- Paul Barker