[oe-commits] Chris Larson : Revert "package.bbclass: when running 'file', be explicit about the path to the magic"
git version control
git at git.openembedded.org
Fri Feb 19 19:12:53 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 40eae518118907dbbf8096a1eb646511ec27bc6f
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=40eae518118907dbbf8096a1eb646511ec27bc6f
Author: Chris Larson <chris_larson at mentor.com>
Date: Fri Feb 19 12:12:25 2010 -0700
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.
---
classes/package.bbclass | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/classes/package.bbclass b/classes/package.bbclass
index 72c9053..062f782 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)
More information about the Openembedded-commits
mailing list