From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: openembedded-core <openembedded-core@lists.openembedded.org>
Subject: package.bbclass: Handle subprocess errors correctly
Date: Mon, 25 Mar 2013 16:54:47 +0000 [thread overview]
Message-ID: <1364230487.3097.62.camel@ted> (raw)
If an error occurs in subprocess.call() we currently don't catch it. In particular
we have issues where debugedit is segfaulting unnoticed. This fixes up
various code paths to catch the errors.
[YOCTO #4089]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index b6f8767..958f616 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -254,14 +254,23 @@ def splitdebuginfo(file, debugfile, debugsrcdir, d):
# We need to extract the debug src information here...
if debugsrcdir:
- subprocess.call("'%s' -b '%s' -d '%s' -i -l '%s' '%s'" % (debugedit, workparentdir, debugsrcdir, sourcefile, file), shell=True)
+ cmd = "'%s' -b '%s' -d '%s' -i -l '%s' '%s'" % (debugedit, workparentdir, debugsrcdir, sourcefile, file)
+ retval = subprocess.call(cmd, shell=True)
+ if retval:
+ bb.fatal("debugedit failed with exit code %s (cmd was %s)" % (retval, cmd))
bb.utils.mkdirhier(os.path.dirname(debugfile))
- subprocess.call("'%s' --only-keep-debug '%s' '%s'" % (objcopy, file, debugfile), shell=True)
+ cmd = "'%s' --only-keep-debug '%s' '%s'" % (objcopy, file, debugfile)
+ retval = subprocess.call(cmd, shell=True)
+ if retval:
+ bb.fatal("objcopy failed with exit code %s (cmd was %s)" % (retval, cmd))
# Set the debuglink to have the view of the file path on the target
- subprocess.call("'%s' --add-gnu-debuglink='%s' '%s'" % (objcopy, debugfile, file), shell=True)
+ cmd = "'%s' --add-gnu-debuglink='%s' '%s'" % (objcopy, debugfile, file)
+ retval = subprocess.call(cmd, shell=True)
+ if retval:
+ bb.fatal("objcopy failed with exit code %s (cmd was %s)" % (retval, cmd))
if newmode:
os.chmod(file, origmode)
@@ -298,10 +307,17 @@ def copydebugsources(debugsrcdir, d):
processdebugsrc += "fgrep -z '%s' | "
processdebugsrc += "(cd '%s' ; cpio -pd0mlL --no-preserve-owner '%s%s' 2>/dev/null)"
- subprocess.call(processdebugsrc % (sourcefile, workbasedir, workparentdir, dvar, debugsrcdir), shell=True)
+ cmd = processdebugsrc % (sourcefile, workbasedir, workparentdir, dvar, debugsrcdir)
+ retval = subprocess.call(cmd, shell=True)
+ if retval:
+ bb.fatal("debug source copy failed with exit code %s (cmd was %s)" % (retval, cmd))
+
# The copy by cpio may have resulted in some empty directories! Remove these
- subprocess.call("find %s%s -empty -type d -delete" % (dvar, debugsrcdir), shell=True)
+ cmd = "find %s%s -empty -type d -delete" % (dvar, debugsrcdir)
+ retval = subprocess.call(cmd, shell=True)
+ if retval:
+ bb.fatal("empty directory removal failed with exit code %s (cmd was %s)" % (retval, cmd))
# Also remove debugsrcdir if its empty
for p in nosuchdir[::-1]:
@@ -431,7 +447,10 @@ python perform_packagecopy () {
# Start by package population by taking a copy of the installed
# files to operate on
# Preserve sparse files and hard links
- subprocess.call('tar -cf - -C %s -ps . | tar -xf - -C %s' % (dest, dvar), shell=True)
+ cmd = 'tar -cf - -C %s -ps . | tar -xf - -C %s' % (dest, dvar)
+ retval = subprocess.call(cmd, shell=True)
+ if retval:
+ bb.fatal("file copy failed with exit code %s (cmd was %s)" % (retval, cmd))
# replace RPATHs for the nativesdk binaries, to make them relocatable
if bb.data.inherits_class('nativesdk', d) or bb.data.inherits_class('cross-canadian', d):
next reply other threads:[~2013-03-25 17:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-25 16:54 Richard Purdie [this message]
2013-03-25 17:37 ` package.bbclass: Handle subprocess errors correctly Chris Larson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1364230487.3097.62.camel@ted \
--to=richard.purdie@linuxfoundation.org \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox