From: Chris Larson <chris_larson@mentor.com>
Date: Fri, 19 Feb 2010 19:12:25 +0000 (-0700)
Subject: Revert "package.bbclass: when running 'file', be explicit about the path to the magic"
X-Git-Tag: Release-2010-05/1~491^2~161
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40eae518118907dbbf8096a1eb646511ec27bc6f;p=openembedded.git

Revert "package.bbclass: when running 'file', be explicit about the path to the magic"

Forgot to check a git status / log before pushing :)

This reverts commit bd711cfab09394b6f3064eaed24b8761edc19f19.
---

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)