From: Chris Larson <clarson@kergoth.com>
Date: Mon, 1 Mar 2010 18:15:56 +0000 (-0700)
Subject: Revert "package.bbclass: when running 'file', be explicit about the path to the magic"
X-Git-Tag: Release-2010-05/1~490^2~16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ce55ea62be97061e4b02c189f77a4ca506f3a7d;p=openembedded.git

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.
---

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)