[oe-commits] Muhammad Shakeel : qa.py: Toolchain path should not be hardcoded to execute objdump

git at git.openembedded.org git at git.openembedded.org
Thu Dec 6 12:34:44 UTC 2012


Module: openembedded-core.git
Branch: master
Commit: a3a0e29d5d796fdf6755503cc31e45199b79d756
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=a3a0e29d5d796fdf6755503cc31e45199b79d756

Author: Muhammad Shakeel <muhammad_shakeel at mentor.com>
Date:   Tue Dec  4 15:40:59 2012 +0500

qa.py: Toolchain path should not be hardcoded to execute objdump

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.

Signed-off-by: Christopher Larson <chris_larson at mentor.com>
Signed-off-by: Muhammad Shakeel <muhammad_shakeel at mentor.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/lib/oe/qa.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/lib/oe/qa.py b/meta/lib/oe/qa.py
index 2c51141..d9848c8 100644
--- a/meta/lib/oe/qa.py
+++ b/meta/lib/oe/qa.py
@@ -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))





More information about the Openembedded-commits mailing list