diff options
| author |   Chris Larson <chris_larson@mentor.com> | 2010-02-19 12:12:25 -0700 |
|---|---|---|
| committer | Chris Larson <chris_larson@mentor.com> | 2010-02-19 12:12:30 -0700 |
| commit | 40eae518118907dbbf8096a1eb646511ec27bc6f (patch) | |
| tree | a046ebb94a936aba31b1cd128ceea9e7cf784e38 /classes | |
| parent | ac71f240bf08b559557616f4071e85d55bf9d28c (diff) | |
| download | openembedded-40eae518118907dbbf8096a1eb646511ec27bc6f.tar.gz | |
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.
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/package.bbclass | 5 |
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) |