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:34:22 +0100 |
| commit | 2f32ef9d1fea425d7ad1ee59d83537658f9c50b8 (patch) | |
| tree | aa864716ecdcca1c9aa97819ec80b3465c700877 /meta/classes/insane.bbclass | |
| parent | fc829756079100bec0ae3929ea5f690b8cd7f689 (diff) | |
| download | poky-2f32ef9d1fea425d7ad1ee59d83537658f9c50b8.tar.gz | |
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 <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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): | |||
| 265 | full_path = os.path.join(root,file) | 265 | full_path = os.path.join(root,file) |
| 266 | my_files.append(full_path[len(pkgd):]) | 266 | my_files.append(full_path[len(pkgd):]) |
| 267 | 267 | ||
| 268 | lib_re = re.compile("^/lib.*\.so") | 268 | lib_re = re.compile("^lib.+\.so(\..+)?$") |
| 269 | exec_re = re.compile("^%s.*/lib*.\.so" % exec_prefix) | 269 | exec_re = re.compile("^%s.*/lib.+\.so(\..+)?$" % exec_prefix) |
| 270 | 270 | ||
| 271 | for file in my_files: | 271 | for file in my_files: |
| 272 | if lib_re.match(file): | 272 | if lib_re.match(file): |