summaryrefslogtreecommitdiff
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:38 +0000
commit95b161a6661faf654fed5c69b905157e927bcb5f (patch)
tree32a7fb945740b6658fb46488741eb2c519737e08 /meta/classes/uninative.bbclass
parent79d320544202d719eeb5affd9b687505dcd9b725 (diff)
downloadopenembedded-core-95b161a6661faf654fed5c69b905157e927bcb5f.tar.gz
openembedded-core-95b161a6661faf654fed5c69b905157e927bcb5f.tar.bz2
openembedded-core-95b161a6661faf654fed5c69b905157e927bcb5f.zip
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>
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 () {
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)
}