summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Garman <scott.a.garman@intel.com>2012-01-05 13:12:50 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-05 22:17:23 +0000
commit0443487fe0bc628db9b03306bdc9dcdb39a121dc (patch)
treef014a111fad1084d42ec1f01d1020e0d68815858
parent563828bad19a242bba9ce3db461bb5807037dfdf (diff)
downloadopenembedded-core-0443487fe0bc628db9b03306bdc9dcdb39a121dc.tar.gz
openembedded-core-0443487fe0bc628db9b03306bdc9dcdb39a121dc.tar.bz2
openembedded-core-0443487fe0bc628db9b03306bdc9dcdb39a121dc.zip
insane.bbclass: use bb.process.Popen instead of subprocess.check_output
subprocess.check_output was only introduced in Python v2.7, so we cannot use it. This refactors the QA test to use bb.process.Popen instead. This fixes the error: AttributeError: 'module' object has no attribute 'check_output' It no longer checks the return status of prelink-rtld, as that case was simply adding noise. This QA test is intended to only warn about specific paths that binaries could be linking to, not handle the case where there is a missing library. Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/insane.bbclass16
1 files changed, 6 insertions, 10 deletions
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index b8d45073ef..8d6b11c1cf 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -227,16 +227,12 @@ def package_qa_check_unsafe_references_in_binaries(path, name, d, elf, messages)
sysroot_path_usr = sysroot_path + exec_prefix
try:
- ldd_output = sub.check_output(["prelink-rtld", "--root", sysroot_path, path])
- except sub.CalledProcessError as e:
- if e.returncode != 127:
- error_msg = pn + ": prelink-rtld aborted when processing %s" % path
- package_qa_handle_error("unsafe-references-in-binaries", error_msg, d)
- return False
- else:
- # Sometimes this is done deliberately (e.g, e2fsprogs), so only warn
- bb.warn("%s has missing library dependencies" % path)
- return
+ ldd_output = bb.process.Popen(["prelink-rtld", "--root", sysroot_path, path], stdout=sub.PIPE).stdout.read()
+ except bb.process.CmdError:
+ error_msg = pn + ": prelink-rtld aborted when processing %s" % path
+ package_qa_handle_error("unsafe-references-in-binaries", error_msg, d)
+ return False
+
if sysroot_path_usr in ldd_output:
error_msg = pn + ": %s links to something under exec_prefix" % path
package_qa_handle_error("unsafe-references-in-binaries", error_msg, d)