summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuro Bystricky <juro.bystricky@intel.com>2015-12-08 10:51:39 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-12 23:42:52 +0000
commitec79a19f24285227fd6b9735cc854db676a39fff (patch)
tree7309451b7f943fb8ae6c63962813e55312777a2f
parent9c0186fd57fe6b8ed7b4de7645fdadfc2e5db149 (diff)
downloadpoky-ec79a19f24285227fd6b9735cc854db676a39fff.tar.gz
insane: in libdir test allow libraries in libexecdir
Some recipes, such as sudo and gcc, put libraries into libexecdir. Allow this in the sanity test so that we don't have to whitelist the libdir check. (From OE-Core rev: 9f5ad12a9532687a7a82e24b7c4506cabc13bba2) Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/insane.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 2a1e30b776..bf6a598484 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -292,6 +292,7 @@ def package_qa_check_libdir(d):
292 pkgdest = d.getVar('PKGDEST', True) 292 pkgdest = d.getVar('PKGDEST', True)
293 base_libdir = d.getVar("base_libdir",True) + os.sep 293 base_libdir = d.getVar("base_libdir",True) + os.sep
294 libdir = d.getVar("libdir", True) + os.sep 294 libdir = d.getVar("libdir", True) + os.sep
295 libexecdir = d.getVar("libexecdir", True) + os.sep
295 exec_prefix = d.getVar("exec_prefix", True) + os.sep 296 exec_prefix = d.getVar("exec_prefix", True) + os.sep
296 297
297 messages = [] 298 messages = []
@@ -322,7 +323,7 @@ def package_qa_check_libdir(d):
322 if base_libdir not in rel_path: 323 if base_libdir not in rel_path:
323 messages.append("%s: found library in wrong location: %s" % (package, rel_path)) 324 messages.append("%s: found library in wrong location: %s" % (package, rel_path))
324 if exec_re.match(rel_path): 325 if exec_re.match(rel_path):
325 if libdir not in rel_path: 326 if libdir not in rel_path and libexecdir not in rel_path:
326 messages.append("%s: found library in wrong location: %s" % (package, rel_path)) 327 messages.append("%s: found library in wrong location: %s" % (package, rel_path))
327 328
328 if messages: 329 if messages: