From 2f32ef9d1fea425d7ad1ee59d83537658f9c50b8 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 3 Jul 2013 16:09:32 +0100 Subject: 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*.). (From OE-Core rev: 391a361190d7da19ad3381121649a41a28516cb5) Signed-off-by: Paul Eggleton Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/insane.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'meta/classes') 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): -- cgit v1.2.3-54-g00ecf