summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael 'Mickey' Lauer <mickey@vanille-media.de>2010-02-26 21:14:56 +0100
committerMichael 'Mickey' Lauer <mickey@vanille-media.de>2010-02-26 21:14:56 +0100
commit49866f6c6aff571001831ae71b4392e117a68edc (patch)
treefb79a39b0480135873040593c9640ef33ea0af9b
parent61b59fd77741142f16162c354c191616aae87204 (diff)
parent1b5e7041ae3b26b7e59c76bd2f2fd72e35492940 (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
-rw-r--r--classes/package.bbclass5
1 files changed, 3 insertions, 2 deletions
diff --git a/classes/package.bbclass b/classes/package.bbclass
index 062f782129..72c9053cc4 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -155,11 +155,12 @@ def runstrip(file, d):
import commands, stat
pathprefix = "export PATH=%s; " % bb.data.getVar('PATH', d, True)
+ magicfile = "%s/file/magic" % bb.data.getVar('STAGING_DATADIR_NATIVE', d, True)
- ret, result = commands.getstatusoutput("%sfile '%s'" % (pathprefix, file))
+ ret, result = commands.getstatusoutput("%sfile -m %s '%s'" % (pathprefix, magicfile, file))
if ret:
- bb.error("runstrip: 'file %s' failed (forced strip)" % file)
+ bb.error("runstrip: 'file -m %s %s' failed (forced strip)" % (magicfile, file))
if "not stripped" not in result:
bb.debug(1, "runstrip: skip %s" % file)