summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-03-01 08:54:38 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-09 16:54:37 +0000
commitd78921e91ea1caf0154d544496a8aeabc2ec543d (patch)
treebb4b22e3f37c3b9d66348da579840b30ea3be816
parent57881c3dc68bd8697aaac7fa3587202121a042a4 (diff)
downloadopenembedded-core-contrib-d78921e91ea1caf0154d544496a8aeabc2ec543d.tar.gz
openembedded-core-contrib-d78921e91ea1caf0154d544496a8aeabc2ec543d.tar.bz2
openembedded-core-contrib-d78921e91ea1caf0154d544496a8aeabc2ec543d.zip
image-prelink: use STAGING_*_NATIVE variables
Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image-prelink.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/image-prelink.bbclass b/meta/classes/image-prelink.bbclass
index e153f47881..4157df021a 100644
--- a/meta/classes/image-prelink.bbclass
+++ b/meta/classes/image-prelink.bbclass
@@ -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