From: Paul Eggleton Date: Wed, 3 Jul 2013 15:09:32 +0000 (+0100) Subject: classes/insane: fix libdir check regexes X-Git-Tag: 2015-4~5971 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=391a361190d7da19ad3381121649a41a28516cb5;p=openembedded-core.git 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 Signed-off-by: Saul Wold --- diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 27c225f3c0..938c84ee15 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):