From 62f1ccbbbd536c85554c556bbbfd506088aebefb Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Fri, 17 Aug 2012 14:26:33 +0100 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/chrpath.bbclass | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/meta/classes/chrpath.bbclass b/meta/classes/chrpath.bbclass index ad61fe09ea..89222484b8 100644 --- a/meta/classes/chrpath.bbclass +++ b/meta/classes/chrpath.bbclass @@ -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) -- cgit v1.2.3-54-g00ecf