1 files changed, 18 insertions, 1 deletions

diff --git a/meta/classes/image-prelink.bbclass b/meta/classes/image-prelink.bbclass
index d4bb3aec39..53c4b0b112 100644
--- a/meta/classes/image-prelink.bbclass
+++ b/meta/classes/image-prelink.bbclass
@@ -1,6 +1,10 @@
 do_rootfs[depends] += "prelink-native:do_populate_sysroot"
 
-IMAGE_PREPROCESS_COMMAND += "prelink_image; "
+IMAGE_PREPROCESS_COMMAND += "prelink_setup; prelink_image; "
+
+python prelink_setup () {
+    oe.utils.write_ld_so_conf(d)
+}
 
 prelink_image () {
 #       export PSEUDO_DEBUG=4
@@ -20,6 +24,13 @@ prelink_image () {
                 dummy_prelink_conf=false;
         fi
 
+        # We need a ld.so.conf with pathnames in,prelink conf on the filesystem, add one if it's missing
+        ldsoconf=${IMAGE_ROOTFS}${sysconfdir}/ld.so.conf
+        if [ -e $ldsoconf ]; then
+                cp $ldsoconf $ldsoconf.prelink
+        fi
+        cat ${STAGING_DIR_TARGET}${sysconfdir}/ld.so.conf >> $ldsoconf
+
         # prelink!
         ${STAGING_DIR_NATIVE}${sbindir_native}/prelink --root ${IMAGE_ROOTFS} -amR -N -c ${sysconfdir}/prelink.conf
 
@@ -28,6 +39,12 @@ prelink_image () {
                 rm -f ${IMAGE_ROOTFS}${sysconfdir}/prelink.conf
         fi
 
+        if [ -e $ldsoconf.prelink ]; then
+                mv $ldsoconf.prelink $ldsoconf
+        else
+                rm $ldsoconf
+        fi
+
         pre_prelink_size=`du -ks ${IMAGE_ROOTFS} | awk '{size = $1 ; print size }'`
         echo "Size after prelinking $pre_prelink_size."
 }