summaryrefslogtreecommitdiff
path: root/classes/package.bbclass
diff options
context:
space:
mode:
authorChris Larson <clarson@kergoth.com>2010-03-01 11:15:56 -0700
committerChris Larson <clarson@kergoth.com>2010-03-01 11:15:56 -0700
commit9ce55ea62be97061e4b02c189f77a4ca506f3a7d (patch)
tree29a003208e603a389b9d9582db6df10673931c65 /classes/package.bbclass
parent04fa0decdce96960c89ab8da99e9b1d71dd1739b (diff)
Revert "package.bbclass: when running 'file', be explicit about the path to the magic"
Drop this for now, as apparently the magic file location varies with 'file' version. I'll just patch file to find it relative to the binary location instead. This reverts commit 1b5e7041ae3b26b7e59c76bd2f2fd72e35492940.
Diffstat (limited to 'classes/package.bbclass')
-rw-r--r--classes/package.bbclass5
1 files changed, 2 insertions, 3 deletions
diff --git a/classes/package.bbclass b/classes/package.bbclass
index 72c9053cc4..062f782129 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -155,12 +155,11 @@ 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 -m %s '%s'" % (pathprefix, magicfile, file))
+ ret, result = commands.getstatusoutput("%sfile '%s'" % (pathprefix, file))
if ret:
- bb.error("runstrip: 'file -m %s %s' failed (forced strip)" % (magicfile, file))
+ bb.error("runstrip: 'file %s' failed (forced strip)" % file)
if "not stripped" not in result:
bb.debug(1, "runstrip: skip %s" % file)