aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRene Wagner <rw@handhelds.org>2006-01-30 19:19:11 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-01-30 19:19:11 +0000
commit4316c27a53575bb4085d70af405323884b75affa (patch)
tree9d2c43f679f17c2afd2a17524d781ca0af6c4371
parent9b6473858644146a940a2f3c6d65f454ae9a674b (diff)
downloadopenembedded-4316c27a53575bb4085d70af405323884b75affa.tar.gz
openembedded-4316c27a53575bb4085d70af405323884b75affa.tar.bz2
openembedded-4316c27a53575bb4085d70af405323884b75affa.zip
package.bbclass: fix stripping logic. work around strip returning 0 even on failure.
-rw-r--r--classes/package.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/package.bbclass b/classes/package.bbclass
index dbb65cdf06..8375e61959 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -168,7 +168,7 @@ python populate_packages () {
if (bb.data.getVar('INHIBIT_PACKAGE_STRIP', d, 1) != '1') and not os.path.islink(file) and isexec(file):
if bb.data.getVar('IGNORE_STRIP_ERRORS', d, 1) != '1':
# bail out on errors
- stripfunc += "file %s | grep -q 'not stripped' && ${STRIP} %s || return 1;\n" % (fpath, fpath)
+ stripfunc += "if (file %s | grep -q 'not stripped'); then echo 'Trying to strip: %s'; if ${STRIP} %s 2>&1 | grep strip; then return 1; fi; fi;\n" % (fpath, fpath, fpath)
else:
# old behaviour: ignore errors
stripfunc += "${STRIP} %s || : ;\n" % fpath