From 86508c7c6b59825f8a82361794beee0eac46dc6e Mon Sep 17 00:00:00 2001
From: Rene Wagner <rw@handhelds.org>
Date: Sun, 29 Jan 2006 23:41:19 +0000
Subject: 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

---
 classes/package.bbclass | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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")
-- 
cgit v1.2.3