classes/insane: fix libdir check regexes

PATCH New Paul Eggleton 1 participant 1 message Jul 3, 2013

Share & tools

Paul Eggleton

author

2013-07-03 15:09 UTC #0 lore raw

PATCH v2 1/1 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 <[email protected]>

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

meta/classes/insane.bbclass +2 -2

index 27c225f..938c84e 100644
@@ -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):

Signature · 1 line

1.8.1.2