classes/chrpath: improve chrpath failure handling

When chrpath fails, prefix the error message with the name of the recipe
that is being processed, and include the the output from chrpath, as
well as making the calling task actually fail.

(From OE-Core rev: 99815eddd4e1eb5d939831704231537dd5a995ad)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton
2012-08-17 14:26:33 +01:00
committed by Richard Purdie
parent bddd830032
commit 62f1ccbbbd

View File

@@ -74,9 +74,11 @@ def process_dir (directory, d):
if len(new_rpaths):
args = ":".join(new_rpaths)
#bb.note("Setting rpath for %s to %s" %(fpath, args))
ret = sub.call([cmd, '-r', args, fpath])
if ret != 0:
bb.error("chrpath command failed with exit code %d" % ret)
p = sub.Popen([cmd, '-r', args, fpath],stdout=sub.PIPE,stderr=sub.PIPE)
out, err = p.communicate()
if p.returncode != 0:
bb.error("%s: chrpath command failed with exit code %d:\n%s%s" % (d.getVar('PN', True), p.returncode, out, err))
raise bb.build.FuncFailed
if perms:
os.chmod(fpath, perms)