From ae85c4b9a6609523c293173843679733b1ede7ba Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 4 Mar 2016 16:28:40 +0000 Subject: linuxloader/image-prelink/image-mklibs: Fix non-standard path prelinking Prelinking on x86-64 wasn't working out the box as it uses /lib and not /lib64 for libs. Prelink was refusing to link as the dynamic loader didn't match its idea of the right path. Passing in the --dyanmic-linker option avoids this. We can share code from image-mklibs so abstract that into a new class, linuxloader.bbclass. This does break prelinking of multilib images, I've opened a bug so we can loop back and fix that problem, the code would need to iterate the dynamic loaders (and setup ld.so.conf files for it). (From OE-Core rev: 7c3f2f61536cc8e0322087558cdcfe29ee2fac6d) Signed-off-by: Richard Purdie --- meta/classes/linuxloader.bbclass | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 meta/classes/linuxloader.bbclass (limited to 'meta/classes/linuxloader.bbclass') diff --git a/meta/classes/linuxloader.bbclass b/meta/classes/linuxloader.bbclass new file mode 100644 index 0000000000..5c4dc5c51b --- /dev/null +++ b/meta/classes/linuxloader.bbclass @@ -0,0 +1,24 @@ + +linuxloader () { + case ${TARGET_ARCH} in + powerpc | mips | mipsel | microblaze ) + dynamic_loader="${base_libdir}/ld.so.1" + ;; + powerpc64) + dynamic_loader="${base_libdir}/ld64.so.1" + ;; + x86_64) + dynamic_loader="${base_libdir}/ld-linux-x86-64.so.2" + ;; + i*86 ) + dynamic_loader="${base_libdir}/ld-linux.so.2" + ;; + arm ) + dynamic_loader="${base_libdir}/ld-linux.so.3" + ;; + * ) + dynamic_loader="/unknown_dynamic_linker" + ;; + esac + echo $dynamic_loader +} -- cgit v1.2.3-54-g00ecf