From af1d9f42f75f798a0dacbcfe085e373e3894e149 Mon Sep 17 00:00:00 2001 From: Radu Moisan Date: Wed, 19 Sep 2012 12:32:39 +0300 Subject: [PATCH] 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] (From OE-Core rev: 534fa3a55de19f249583207aaeec58fec8154a1d) Signed-off-by: Radu Moisan Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/insane.bbclass | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) 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") -- 2.7.4