diff options
| -rw-r--r-- | meta/classes/image-mklibs.bbclass | 23 | ||||
| -rw-r--r-- | meta/classes/image-prelink.bbclass | 6 | ||||
| -rw-r--r-- | meta/classes/linuxloader.bbclass | 24 |
3 files changed, 32 insertions, 21 deletions
diff --git a/meta/classes/image-mklibs.bbclass b/meta/classes/image-mklibs.bbclass index cfb3ffc91e..6c0e8dcf35 100644 --- a/meta/classes/image-mklibs.bbclass +++ b/meta/classes/image-mklibs.bbclass @@ -2,6 +2,8 @@ do_rootfs[depends] += "mklibs-native:do_populate_sysroot" IMAGE_PREPROCESS_COMMAND += "mklibs_optimize_image; " +inherit linuxloader + mklibs_optimize_image_doit() { rm -rf ${WORKDIR}/mklibs mkdir -p ${WORKDIR}/mklibs/dest @@ -15,26 +17,7 @@ mklibs_optimize_image_doit() { | sed "s+^\./++" \ > ${WORKDIR}/mklibs/executables.list - 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 + dynamic_loader=$(linuxloader) mklibs -v \ --ldlib ${dynamic_loader} \ diff --git a/meta/classes/image-prelink.bbclass b/meta/classes/image-prelink.bbclass index 53c4b0b112..e153f47881 100644 --- a/meta/classes/image-prelink.bbclass +++ b/meta/classes/image-prelink.bbclass @@ -6,6 +6,8 @@ python prelink_setup () { oe.utils.write_ld_so_conf(d) } +inherit linuxloader + prelink_image () { # export PSEUDO_DEBUG=4 # /bin/env | /bin/grep PSEUDO @@ -31,8 +33,10 @@ prelink_image () { fi cat ${STAGING_DIR_TARGET}${sysconfdir}/ld.so.conf >> $ldsoconf + dynamic_loader=$(linuxloader) + # prelink! - ${STAGING_DIR_NATIVE}${sbindir_native}/prelink --root ${IMAGE_ROOTFS} -amR -N -c ${sysconfdir}/prelink.conf + ${STAGING_DIR_NATIVE}${sbindir_native}/prelink --root ${IMAGE_ROOTFS} -amR -N -c ${sysconfdir}/prelink.conf --dynamic-linker $dynamic_loader # Remove the prelink.conf if we had to add it. if [ "$dummy_prelink_conf" = "true" ]; then 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 +} |