mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-23 00:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

sanity.bbclass: always use oe.lsb.distro_identifier method

Browse Source 
* even when /etc/redhat-release or /etc/SuSE-release exists
* don't read /etc/lsb-release manually, NATIVELSBSTRING is not
  reading it too

(From OE-Core rev: 3dba05d74821f08cd96a18351805c8812ddd626c)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Martin Jansa
2013-03-01 18:42:22 +01:00
committed by Richard Purdie
parent 22b1f63223
commit b892099902
1 changed files with 4 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
meta/classes/sanity.bbclass
View File

@@ -263,39 +263,11 @@ def check_supported_distro(sanity_data):
if not tested_distros:
return
if os.path.exists("/etc/redhat-release"):
f = open("/etc/redhat-release", "r")
try:
distro = f.readline().strip()
finally:
f.close()
elif os.path.exists("/etc/SuSE-release"):
import re
f = open("/etc/SuSE-release", "r")
try:
distro = f.readline()
# Remove the architecture suffix e.g. (i586)
distro = re.sub(r' \([a-zA-Z0-9\-_]*\)$', '', distro).strip()
finally:
f.close()
else:
# Use LSB method
try:
distro = oe.lsb.distro_identifier()
except Exception:
distro = None
try:
distro = oe.lsb.distro_identifier()
except Exception:
distro = None
if not distro:
if os.path.exists("/etc/lsb-release"):
f = open("/etc/lsb-release", "r")
try:
for line in f:
lns = line.split('=')
if lns[0] == "DISTRIB_DESCRIPTION":
distro = lns[1].strip('"\n')
break
finally:
f.close()
if distro:
if distro not in [x.strip() for x in tested_distros.split('\\n')]:
bb.warn('Host distribution "%s" has not been validated with this version of the build system; you may possibly experience unexpected failures. It is recommended that you use a tested distribution.' % distro)