Skip to contentSkip to conversation

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

PATCH In review Martin Jansa 4 participants 5 messages Mar 1, 2013 – Mar 6, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sanity.bbclass: always use oe.lsb.distro_identifier method

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

---
 meta/classes/sanity.bbclass | 36 ++++--------------------------------
 1 file changed, 4 insertions(+), 32 deletions(-)
meta/classes/sanity.bbclass +4 -32
index 94c6ce3..06e95e3 100644
@@ -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)
Signature · 1 line
1.8.1.4
#1 lore raw
Quoted 3 lines · On Friday 01 March 2013 18:42:22 Martin Jansa wrote:

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

Unfortunately this has been merged before I had a chance to reply. FYI I put the code in here to read the files directly on purpose, because most distros bundle up the lsb_release tool with all of the LSB dependencies, so if you want to set up a headless server without some of the LSB dependencies (which include X11) you won't have the lsb_release tool and NATIVELSBSTRING is "Unknown". Yes, I know we have this problem with NATIVELSBSTRING already.

Cheers,
Paul

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
#2 lore raw
Quoted 6 lines · Paul Eggleton

Unfortunately this has been merged before I had a chance to reply. FYI I put the code in here to read the files directly on purpose, because most distros bundle up the lsb_release tool with all of the LSB dependencies, so if you want to set up a headless server without some of the LSB dependencies (which include X11) you won't have the lsb_release tool and NATIVELSBSTRING is "Unknown". Yes, I know we have this problem with NATIVELSBSTRING already.

Score one for Debian, which ships lsb_release in a dedicated package for this exact reason. :)

Ross

#3 lore raw
In reply to Paul Eggleton
Quoted 11 lines · Paul Eggleton
Quoted 3 lines · On Friday 01 March 2013 18:42:22 Martin Jansa wrote:

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

Unfortunately this has been merged before I had a chance to reply. FYI I put the code in here to read the files directly on purpose, because most distros bundle up the lsb_release tool with all of the LSB dependencies, so if you want to set up a headless server without some of the LSB dependencies (which include X11) you won't have the lsb_release tool and NATIVELSBSTRING is "Unknown". Yes, I know we have this problem with NATIVELSBSTRING already.

then we should fix it in oe.lsb.distro_identifier method and share the same code for sanity and NATIVELSBSTRING.

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#4 lore raw
In reply to Paul Eggleton
Quoted 5 lines · Paul Eggleton
Quoted 3 lines · On Friday 01 March 2013 18:42:22 Martin Jansa wrote:

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

Quoted 7 lines

Unfortunately this has been merged before I had a chance to reply. FYI I put the code in here to read the files directly on purpose, because most distros bundle up the lsb_release tool with all of the LSB dependencies, so if you want to set up a headless server without some of the LSB dependencies (which include X11) you won't have the lsb_release tool and NATIVELSBSTRING is "Unknown". Yes, I know we have this problem with NATIVELSBSTRING already.

+1, but not just headless server, my FC18 release does not have lsb_release installed at all.

Sau!

Quoted 3 lines

Cheers,
Paul