From 0cc825f13ef4d331fd8deacbd28d97a21bab3fd4 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 4 Feb 2016 08:31:38 +0000 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/uninative.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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) } -- cgit v1.2.3-54-g00ecf