Patchwork [v2] classes/insane: fix libdir check regexes

login
register
mail settings
Submitter Paul Eggleton
Date July 3, 2013, 3:09 p.m.
Message ID <1372864172-5346-1-git-send-email-paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/52913/
State Accepted
Commit 2f32ef9d1fea425d7ad1ee59d83537658f9c50b8
Headers show

Comments

Paul Eggleton - July 3, 2013, 3:09 p.m.
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@linux.intel.com>
---
 meta/classes/insane.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

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):