summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <tom_rini@mentor.com>2010-02-19 11:34:44 -0700
committerChris Larson <chris_larson@mentor.com>2010-02-19 12:09:23 -0700
commitbd711cfab09394b6f3064eaed24b8761edc19f19 (patch)
tree5f0ea15bbdc32d83ead83f492f7fa9bf3be4a70e
parent0a831e2cd1c27d30cd76ddada9a44a703ab60f41 (diff)
package.bbclass: when running 'file', be explicit about the path to the magic
This works around one relocation issue. Signed-off-by: Tom Rini <tom_rini@mentor.com> Signed-off-by: Chris Larson <chris_larson@mentor.com>
-rw-r--r--classes/package.bbclass5
1 files changed, 3 insertions, 2 deletions
diff --git a/classes/package.bbclass b/classes/package.bbclass
index 062f782129..72c9053cc4 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -155,11 +155,12 @@ 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 '%s'" % (pathprefix, file))
+ ret, result = commands.getstatusoutput("%sfile -m %s '%s'" % (pathprefix, magicfile, file))
if ret:
- bb.error("runstrip: 'file %s' failed (forced strip)" % file)
+ bb.error("runstrip: 'file -m %s %s' failed (forced strip)" % (magicfile, file))
if "not stripped" not in result:
bb.debug(1, "runstrip: skip %s" % file)