diff options
| author | Rene Wagner <rw@handhelds.org> | 2006-01-29 23:41:19 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-01-29 23:41:19 +0000 |
| commit | 86508c7c6b59825f8a82361794beee0eac46dc6e (patch) | |
| tree | 84778c9544c69cbf3c75ecc883a08f2a9b49ed1c | |
| parent | 2228ad0352168c2686c945b7b481be0bacb3b193 (diff) | |
package.bbclass: don't silently ignore errors when running STRIP. Set IGNORE_STRIP_ERRORS to get the old behaviour back. Part of a fix for hh.org Bug #1469
| -rw-r--r-- | classes/package.bbclass | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/classes/package.bbclass b/classes/package.bbclass index db479d5847..dbb65cdf06 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -166,7 +166,12 @@ python populate_packages () { dpath = os.path.dirname(fpath) bb.mkdirhier(dpath) if (bb.data.getVar('INHIBIT_PACKAGE_STRIP', d, 1) != '1') and not os.path.islink(file) and isexec(file): - stripfunc += "${STRIP} %s || : ;\n" % fpath + 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) + else: + # old behaviour: ignore errors + stripfunc += "${STRIP} %s || : ;\n" % fpath ret = bb.movefile(file,fpath) if ret is None or ret == 0: raise bb.build.FuncFailed("File population failed") |