classes/insane: fix libdir check regexes

PATCH Superseded Paul Eggleton 2 participants 3 messages Jul 3, 2013

lore

Share & tools

lore

Paul Eggleton

author

2013-07-03 13:41 UTC #0 lore raw

PATCH 1/1 classes/insane: fix libdir check regexes

* Ensure these do not pick up e.g. /lib/systemd/system/uuidd.socket
* Fix broken exec_re regex (lib*. -> 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..af419f1 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[0-9.]*$")
+    exec_re = re.compile("^%s.*/lib.*\.so[0-9.]*$" % exec_prefix)
 
     for file in my_files:
         if lib_re.match(file):

Signature · 1 line

1.8.1.2

Burton, Ross

2013-07-03 14:35 UTC #1 lore raw

meta/classes/insane.bbclass def package_qa_check_libdir(d): · line 269

Quoted 2 lines · Paul Eggleton

meta/classes/insane.bbclass +2 -0

+    lib_re = re.compile("^/lib.*\.so[0-9.]*$")
+    exec_re = re.compile("^%s.*/lib.*\.so[0-9.]*$" % exec_prefix)

I'd been meaning to double-check this assumption since the discussion yesterday, and I'm glad I did. My Debian machine has these files in /usr/lib that don't match that regex:

libatlas.so.3gf
libblas.so.3gf
libcblas.so.3gf
libf77blas.so.3gf
liblapack_atlas.so.3gf
liblapack.so.3gf
libmozjs.so.10d
libnspr4.so.0d
libnss3.so.1d
libnssutil3.so.1d
libplc4.so.0d
libplds4.so.0d
libsmime3.so.1d
libssl3.so.1d

How about ^lib.+\.so(\..+)?$ to match a library filename?

Ross

Paul Eggleton

author

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

Quoted 23 lines · Ross

meta/classes/insane.bbclass def package_qa_check_libdir(d): · line 269
Quoted 2 lines · Paul Eggleton
meta/classes/insane.bbclass +2 -0
+    lib_re = re.compile("^/lib.*\.so[0-9.]*$")
+    exec_re = re.compile("^%s.*/lib.*\.so[0-9.]*$" % exec_prefix)
I'd been meaning to double-check this assumption since the discussion yesterday, and I'm glad I did. My Debian machine has these files in /usr/lib that don't match that regex:
libatlas.so.3gf
libblas.so.3gf
libcblas.so.3gf
libf77blas.so.3gf
liblapack_atlas.so.3gf
liblapack.so.3gf
libmozjs.so.10d
libnspr4.so.0d
libnss3.so.1d
libnssutil3.so.1d
libplc4.so.0d
libplds4.so.0d
libsmime3.so.1d
libssl3.so.1d

Quoted 1 line

How about ^lib.+\.so(\..+)?$ to match a library filename?

Hmm, right. That looks reasonable. v2 sent.

Cheers,
Paul

Signature · 2 lines

Paul Eggleton
Intel Open Source Technology Centre