Skip to contentSkip to conversation

Urgent fix for insane.bbclass.

PATCH Applied Scott Garman 2 participants 3 messages Jan 5, 2012

lore
Share & tools
lore
#0 lore raw

cover Urgent fix for insane.bbclass.

Hello,

This fixes the error:

AttributeError: 'module' object has no attribute 'check_output'

which currently is breaking builds for hosts using Python < 2.7. Please apply it ASAP.

Thanks,

Scott

The following changes since commit 563828bad19a242bba9ce3db461bb5807037dfdf:

multilib: Abstract class extension code into classextend.py (2012-01-05 12:36:08 +0000)

are available in the git repository at:
git://git.yoctoproject.org/poky-contrib sgarman/qa-fix-final
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgarman/qa-fix-final

Scott Garman (1):
insane.bbclass: use bb.process.Popen instead of
subprocess.check_output

 meta/classes/insane.bbclass |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)
Signature · 1 line
1.7.5.4
#1 lore raw

PATCH 1/1 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.

---
 meta/classes/insane.bbclass |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)
meta/classes/insane.bbclass +6 -10
index b8d4507..8d6b11c 100644
@@ -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)
Signature · 1 line
1.7.5.4
#2 lore raw

Re: [PATCH 1/1] insane.bbclass: use bb.process.Popen instead of subprocess.check_output

Quoted 13 lines · Scott Garman

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.

Quoted 4 lines
---
 meta/classes/insane.bbclass |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 deletions(-)

Merged to master, thanks for the quick fix!

Cheers,

Richard