[oe-commits] Radu Moisan : insane.bbclass: add library dir sanity check

git at git.openembedded.org git at git.openembedded.org
Fri Sep 21 10:24:58 UTC 2012


Module: openembedded-core.git
Branch: master
Commit: 534fa3a55de19f249583207aaeec58fec8154a1d
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=534fa3a55de19f249583207aaeec58fec8154a1d

Author: Radu Moisan <radu.moisan at intel.com>
Date:   Wed Sep 19 12:32:39 2012 +0300

insane.bbclass: add library dir sanity check

Check in ${PKGD} for libraries in wrong locations.
Trigger a warning if so.
Eg. Catch recipe installing /lib/bar.so when ${base_libdir}="lib32"
or installing in /usr/lib64 when ${libdir}="/usr/lib"

[Yocto #2038]

Signed-off-by: Radu Moisan <radu.moisan at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/classes/insane.bbclass |   39 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 38 insertions(+), 1 deletions(-)

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index e74eb3f..425e93a 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -113,7 +113,7 @@ def package_qa_get_machine_dict():
 
 
 # Currently not being used by default "desktop"
-WARN_QA ?= "ldflags useless-rpaths rpaths unsafe-references-in-binaries unsafe-references-in-scripts staticdev"
+WARN_QA ?= "ldflags useless-rpaths rpaths unsafe-references-in-binaries unsafe-references-in-scripts staticdev libdir"
 ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch la2 pkgconfig la perms"
 
 def package_qa_clean_path(path,d):
@@ -212,6 +212,40 @@ def package_qa_check_staticdev(path, name, d, elf, messages):
         messages.append("non -staticdev package contains static .a library: %s path '%s'" % \
                  (name, package_qa_clean_path(path,d)))
 
+def package_qa_check_libdir(d):
+    """
+    Check for wrong library installation paths. For instance, catch
+    recipes installing /lib/bar.so when ${base_libdir}="lib32" or
+    installing in /usr/lib64 when ${libdir}="/usr/lib"
+    """
+    import re
+
+    pkgd = d.getVar('PKGD', True)
+    base_libdir = d.getVar("base_libdir",True) + os.sep
+    libdir = d.getVar("libdir", True) + os.sep
+    exec_prefix = d.getVar("exec_prefix", True) + os.sep
+
+    messages = []
+    my_files = []
+
+    for root, dirs, files in os.walk(pkgd):
+        for file in files:
+            full_path = os.path.join(root,file)
+            my_files.append(full_path[len(pkgd):])
+
+    lib_re = re.compile("^/lib.*\.so")
+    exec_re = re.compile("^%s.*/lib*.\.so" % exec_prefix)
+
+    for file in my_files:
+        if lib_re.match(file):
+            if base_libdir not in file:
+                messages.append("Found library in wrong location: %s" % file)
+        if exec_re.match(file):
+            if libdir not in file:
+                messages.append("Found library in wrong location: %s" % file)
+    if messages:
+        package_qa_handle_error("libdir", "\n".join(messages), d)
+
 QAPATHTEST[debug-files] = "package_qa_check_dbg"
 def package_qa_check_dbg(path, name, d, elf, messages):
     """
@@ -688,6 +722,9 @@ python do_package_qa () {
             rdepends_sane = False
 
 
+    if 'libdir' in (d.getVar("WARN_QA", True) or "").split():
+        package_qa_check_libdir(d)
+
     if not walk_sane or not rdepends_sane:
         bb.fatal("QA run found fatal errors. Please consider fixing them.")
     bb.note("DONE with PACKAGE QA")





More information about the Openembedded-commits mailing list