summaryrefslogtreecommitdiffstats
path: root/meta/classes/uninative.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-04 08:31:38 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-02-06 23:10:45 +0000
commit0cc825f13ef4d331fd8deacbd28d97a21bab3fd4 (patch)
treea7ef12595f9f25ffc95281966bd40c6335d2a9a4 /meta/classes/uninative.bbclass
parent576a248b46c0e0346c4d0ac8b44af049d5ee7526 (diff)
downloadpoky-0cc825f13ef4d331fd8deacbd28d97a21bab3fd4.tar.gz
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. (From OE-Core rev: 95b161a6661faf654fed5c69b905157e927bcb5f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/uninative.bbclass')
-rw-r--r--meta/classes/uninative.bbclass4
1 files changed, 3 insertions, 1 deletions
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 () {
69 sstateinst = d.getVar('SSTATE_INSTDIR', True) 69 sstateinst = d.getVar('SSTATE_INSTDIR', True)
70 for walkroot, dirs, files in os.walk(sstateinst): 70 for walkroot, dirs, files in os.walk(sstateinst):
71 for file in files: 71 for file in files:
72 if file.endswith(".so") or ".so." in file:
73 continue
72 f = os.path.join(walkroot, file) 74 f = os.path.join(walkroot, file)
73 if os.path.islink(f): 75 if os.path.islink(f):
74 continue 76 continue
@@ -82,5 +84,5 @@ python uninative_changeinterp () {
82 continue 84 continue
83 85
84 #bb.warn("patchelf-uninative --set-interpreter %s %s" % (d.getVar("UNINATIVE_LOADER", True), f)) 86 #bb.warn("patchelf-uninative --set-interpreter %s %s" % (d.getVar("UNINATIVE_LOADER", True), f))
85 subprocess.call("patchelf-uninative --set-interpreter %s %s" % (d.getVar("UNINATIVE_LOADER", True), f), shell=True) 87 subprocess.check_call("patchelf-uninative --set-interpreter %s %s" % (d.getVar("UNINATIVE_LOADER", True), f), shell=True)
86} 88}