From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 4 Feb 2016 08:31:38 +0000 (+0000)
Subject: uninative: Improve error handling
X-Git-Tag: 2016-4~1077
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=95b161a6661faf654fed5c69b905157e927bcb5f;p=openembedded-core.git

uninative: Improve error handling

We need to improve the error handling here, things were breaking and
yet the user wasn't seeing the issues. We need to skip libraries as
we process the files.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass
index 38c05dfc0a..580917b119 100644
--- a/meta/classes/uninative.bbclass
+++ b/meta/classes/uninative.bbclass
@@ -69,6 +69,8 @@ python uninative_changeinterp () {
     sstateinst = d.getVar('SSTATE_INSTDIR', True)
     for walkroot, dirs, files in os.walk(sstateinst):
         for file in files:
+            if file.endswith(".so") or ".so." in file:
+                continue
             f = os.path.join(walkroot, file)
             if os.path.islink(f):
                 continue
@@ -82,5 +84,5 @@ python uninative_changeinterp () {
                 continue
 
             #bb.warn("patchelf-uninative --set-interpreter %s %s" % (d.getVar("UNINATIVE_LOADER", True), f))
-            subprocess.call("patchelf-uninative --set-interpreter %s %s" % (d.getVar("UNINATIVE_LOADER", True), f), shell=True)
+            subprocess.check_call("patchelf-uninative --set-interpreter %s %s" % (d.getVar("UNINATIVE_LOADER", True), f), shell=True)
 }