]> code.ossystems Code Review - openembedded-core.git/commitdiff
image-prelink: use STAGING_*_NATIVE variables
authorRoss Burton <ross.burton@intel.com>
Tue, 1 Mar 2016 08:54:38 +0000 (08:54 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 9 Mar 2016 16:54:37 +0000 (16:54 +0000)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/image-prelink.bbclass

index e153f478812383b3269b9a39db2c90b583680b09..4157df021a7439e6a1304adcf2e35044174da5c5 100644 (file)
@@ -19,7 +19,7 @@ prelink_image () {
 
        # We need a prelink conf on the filesystem, add one if it's missing
        if [ ! -e ${IMAGE_ROOTFS}${sysconfdir}/prelink.conf ]; then
-               cp ${STAGING_DIR_NATIVE}${sysconfdir_native}/prelink.conf \
+               cp ${STAGING_ETCDIR_NATIVE}/prelink.conf \
                        ${IMAGE_ROOTFS}${sysconfdir}/prelink.conf
                dummy_prelink_conf=true;
        else
@@ -36,7 +36,7 @@ prelink_image () {
        dynamic_loader=$(linuxloader)
 
        # prelink!
-       ${STAGING_DIR_NATIVE}${sbindir_native}/prelink --root ${IMAGE_ROOTFS} -amR -N -c ${sysconfdir}/prelink.conf --dynamic-linker $dynamic_loader
+       ${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" = "true" ]; then