From: Rene Wagner <rw@handhelds.org>
Date: Mon, 30 Jan 2006 19:19:11 +0000 (+0000)
Subject: package.bbclass: fix stripping logic. work around strip returning 0 even on failure.
X-Git-Tag: Release-2010-05/1~9453^2~2496
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4316c27a53575bb4085d70af405323884b75affa;p=openembedded.git

package.bbclass: fix stripping logic. work around strip returning 0 even on failure.
---

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