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 72c9053cc4c1eed454b226fb4bd489ec05ba1821..062f782129ae176c8c268193fe20530f3d77785e 100644 (file)
--- 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)