diff options
Diffstat (limited to 'meta/classes/image-prelink.bbclass')
| -rw-r--r-- | meta/classes/image-prelink.bbclass | 38 |
1 files changed, 27 insertions, 11 deletions
diff --git a/meta/classes/image-prelink.bbclass b/meta/classes/image-prelink.bbclass index faf18142e6..4157df021a 100644 --- a/meta/classes/image-prelink.bbclass +++ b/meta/classes/image-prelink.bbclass @@ -1,6 +1,12 @@ 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) +} + +inherit linuxloader prelink_image () { # export PSEUDO_DEBUG=4 @@ -12,27 +18,37 @@ prelink_image () { echo "Size before prelinking $pre_prelink_size." # We need a prelink conf on the filesystem, add one if it's missing - if [ ! -e ${IMAGE_ROOTFS}/etc/prelink.conf ]; then - cp ${STAGING_DIR_NATIVE}/etc/prelink.conf \ - ${IMAGE_ROOTFS}/etc/prelink.conf + if [ ! -e ${IMAGE_ROOTFS}${sysconfdir}/prelink.conf ]; then + cp ${STAGING_ETCDIR_NATIVE}/prelink.conf \ + ${IMAGE_ROOTFS}${sysconfdir}/prelink.conf dummy_prelink_conf=true; else 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 + + dynamic_loader=$(linuxloader) + # prelink! - ${STAGING_DIR_NATIVE}/usr/sbin/prelink --root ${IMAGE_ROOTFS} -amR + ${STAGING_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 ]; then - rm -f ${IMAGE_ROOTFS}/etc/prelink.conf + if [ "$dummy_prelink_conf" = "true" ]; then + rm -f ${IMAGE_ROOTFS}${sysconfdir}/prelink.conf fi - # Cleanup temporary file, it's not needed... - rm -f ${IMAGE_ROOTFS}/etc/prelink.cache + 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." } - -EXPORT_FUNCTIONS prelink_image |