<p dir="ltr">This looks good to me</p>
<div class="gmail_quote">On Mar 5, 2016 12:28 AM, &quot;Richard Purdie&quot; &lt;<a href="mailto:richard.purdie@linuxfoundation.org">richard.purdie@linuxfoundation.org</a>&gt; wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Prelinking on x86-64 wasn&#39;t working out the box as it uses /lib and<br>
not /lib64 for libs. Prelink was refusing to link as the dynamic loader<br>
didn&#39;t match its idea of the right path. Passing in the --dyanmic-linker<br>
option avoids this.<br>
<br>
We can share code from image-mklibs so abstract that into a new class,<br>
linuxloader.bbclass.<br>
<br>
This does break prelinking of multilib images, I&#39;ve opened a bug so we<br>
can loop back and fix that problem, the code would need to iterate the<br>
dynamic loaders (and setup ld.so.conf files for it).<br>
<br>
Signed-off-by: Richard Purdie &lt;<a href="mailto:richard.purdie@linuxfoundation.org">richard.purdie@linuxfoundation.org</a>&gt;<br>
<br>
diff --git a/meta/classes/image-mklibs.bbclass b/meta/classes/image-mklibs.bbclass<br>
index cfb3ffc..45a66fb 100644<br>
--- a/meta/classes/image-mklibs.bbclass<br>
+++ b/meta/classes/image-mklibs.bbclass<br>
@@ -2,6 +2,8 @@ do_rootfs[depends] += &quot;mklibs-native:do_populate_sysroot&quot;<br>
<br>
 IMAGE_PREPROCESS_COMMAND += &quot;mklibs_optimize_image; &quot;<br>
<br>
+inherit linuxloader<br>
+<br>
 mklibs_optimize_image_doit() {<br>
        rm -rf ${WORKDIR}/mklibs<br>
        mkdir -p ${WORKDIR}/mklibs/dest<br>
@@ -15,26 +17,8 @@ mklibs_optimize_image_doit() {<br>
                | sed &quot;s+^\./++&quot; \<br>
                &gt; ${WORKDIR}/mklibs/executables.list<br>
<br>
-       case ${TARGET_ARCH} in<br>
-               powerpc | mips | mipsel | microblaze )<br>
-                       dynamic_loader=&quot;${base_libdir}/ld.so.1&quot;<br>
-                       ;;<br>
-               powerpc64)<br>
-                       dynamic_loader=&quot;${base_libdir}/ld64.so.1&quot;<br>
-                       ;;<br>
-               x86_64)<br>
-                       dynamic_loader=&quot;${base_libdir}/ld-linux-x86-64.so.2&quot;<br>
-                       ;;<br>
-               i*86 )<br>
-                       dynamic_loader=&quot;${base_libdir}/ld-linux.so.2&quot;<br>
-                       ;;<br>
-               arm )<br>
-                       dynamic_loader=&quot;${base_libdir}/ld-linux.so.3&quot;<br>
-                       ;;<br>
-               * )<br>
-                       dynamic_loader=&quot;/unknown_dynamic_linker&quot;<br>
-                       ;;<br>
-       esac<br>
+       # Set $dynamic_loader<br>
+        linuxloader<br>
<br>
        mklibs -v \<br>
                --ldlib ${dynamic_loader} \<br>
diff --git a/meta/classes/image-prelink.bbclass b/meta/classes/image-prelink.bbclass<br>
index 53c4b0b..3fe097b 100644<br>
--- a/meta/classes/image-prelink.bbclass<br>
+++ b/meta/classes/image-prelink.bbclass<br>
@@ -6,6 +6,8 @@ python prelink_setup () {<br>
     oe.utils.write_ld_so_conf(d)<br>
 }<br>
<br>
+inherit linuxloader<br>
+<br>
 prelink_image () {<br>
 #      export PSEUDO_DEBUG=4<br>
 #      /bin/env | /bin/grep PSEUDO<br>
@@ -31,8 +33,11 @@ prelink_image () {<br>
        fi<br>
        cat ${STAGING_DIR_TARGET}${sysconfdir}/ld.so.conf &gt;&gt; $ldsoconf<br>
<br>
+       # Set $dynamic_loader<br>
+       linuxloader<br>
+<br>
        # prelink!<br>
-       ${STAGING_DIR_NATIVE}${sbindir_native}/prelink --root ${IMAGE_ROOTFS} -amR -N -c ${sysconfdir}/prelink.conf<br>
+       ${STAGING_DIR_NATIVE}${sbindir_native}/prelink --root ${IMAGE_ROOTFS} -amR -N -c ${sysconfdir}/prelink.conf --dynamic-linker $dynamic_loader<br>
<br>
        # Remove the prelink.conf if we had to add it.<br>
        if [ &quot;$dummy_prelink_conf&quot; = &quot;true&quot; ]; then<br>
diff --git a/meta/classes/linuxloader.bbclass b/meta/classes/linuxloader.bbclass<br>
new file mode 100644<br>
index 0000000..af649cc<br>
--- /dev/null<br>
+++ b/meta/classes/linuxloader.bbclass<br>
@@ -0,0 +1,23 @@<br>
+<br>
+linuxloader () {<br>
+       case ${TARGET_ARCH} in<br>
+               powerpc | mips | mipsel | microblaze )<br>
+                       dynamic_loader=&quot;${base_libdir}/ld.so.1&quot;<br>
+                       ;;<br>
+               powerpc64)<br>
+                       dynamic_loader=&quot;${base_libdir}/ld64.so.1&quot;<br>
+                       ;;<br>
+               x86_64)<br>
+                       dynamic_loader=&quot;${base_libdir}/ld-linux-x86-64.so.2&quot;<br>
+                       ;;<br>
+               i*86 )<br>
+                       dynamic_loader=&quot;${base_libdir}/ld-linux.so.2&quot;<br>
+                       ;;<br>
+               arm )<br>
+                       dynamic_loader=&quot;${base_libdir}/ld-linux.so.3&quot;<br>
+                       ;;<br>
+               * )<br>
+                       dynamic_loader=&quot;/unknown_dynamic_linker&quot;<br>
+                       ;;<br>
+       esac<br>
+}<br>
<br>
<br>
--<br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</blockquote></div>