uninative: Improve error handling

PATCH New Richard Purdie 1 participant 1 message Feb 4, 2016

Share & tools

Richard Purdie

author

2016-02-04 08:31 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

meta/classes/uninative.bbclass +3 -1

index 38c05df..580917b 100644
@@ -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)
 }