diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-07-03 16:09:32 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-07-05 15:26:20 +0100 |
| commit | 391a361190d7da19ad3381121649a41a28516cb5 (patch) | |
| tree | 729efe2f12580b799cd0cf598c8fd27d88232f68 /meta/classes/insane.bbclass | |
| parent | 8a9a476c03a3bc2782206799933d92e216032ff7 (diff) | |
| download | openembedded-core-391a361190d7da19ad3381121649a41a28516cb5.tar.gz openembedded-core-391a361190d7da19ad3381121649a41a28516cb5.tar.bz2 openembedded-core-391a361190d7da19ad3381121649a41a28516cb5.zip | |
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@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/classes/insane.bbclass')
| -rw-r--r-- | 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 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): |