qa.py: Toolchain path should not be hardcoded to execute objdump
authorMuhammad Shakeel <muhammad_shakeel@mentor.com>
Tue, 4 Dec 2012 10:40:59 +0000 (15:40 +0500)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 6 Dec 2012 12:31:13 +0000 (12:31 +0000)
Currently objdump command is invoked from the STAGING_BINDIR_TOOLCHAIN
directory. In case of external toolchain if this directory doesn't
exist then objdump fails to execute. Instead of hardcoding the path
it should search PATH to find it.

(From OE-Core rev: a3a0e29d5d796fdf6755503cc31e45199b79d756)

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/lib/oe/qa.py

index 2c51141..d9848c8 100644 (file)
@@ -97,14 +97,14 @@ class ELFFile:
             return self.objdump_output[cmd]
 
         objdump = d.getVar('OBJDUMP', True)
-        staging_dir = d.getVar('STAGING_BINDIR_TOOLCHAIN', True)
 
         env = os.environ.copy()
         env["LC_ALL"] = "C"
+        env["PATH"] = d.getVar('PATH', True)
 
         try:
             bb.note("%s %s %s" % (objdump, cmd, self.name))
-            self.objdump_output[cmd] = bb.process.run([ os.path.join(staging_dir, objdump), cmd, self.name ], env=env, shell=False)[0]
+            self.objdump_output[cmd] = bb.process.run([objdump, cmd, self.name], env=env, shell=False)[0]
             return self.objdump_output[cmd]
         except Exception, e:
             bb.note("%s %s %s failed: %s" % (objdump, cmd, self.name, e))