[oe-commits] Paul Eggleton : classes/insane: fix libdir check regexes

[git at git.openembedded.org]

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

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Wed Jul  3 16:09:32 2013 +0100

classes/insane: fix libdir check regexes

Ensure these do not pick up e.g. /lib/systemd/system/uuidd.socket, but
ensure we pickup e.g. /usr/lib/libnss3.so.1d (example from Debian). This
also fixes the broken exec_re regex (lib*.).

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

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

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 27c225f..938c84e 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -265,8 +265,8 @@ def package_qa_check_libdir(d):
             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)
+    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):