diff options
author | Ross Burton <ross.burton@intel.com> | 2016-03-01 08:54:38 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-09 16:58:12 +0000 |
commit | 4dd3e40ed67aabe37016f4827b203a2b74983a70 (patch) | |
tree | 7d9f15055fcc80997c74ef0cd1ede4009f2654fe /meta | |
parent | 2193e9d064c1f99617e3010e884741657d856419 (diff) | |
download | poky-4dd3e40ed67aabe37016f4827b203a2b74983a70.tar.gz |
image-prelink: use STAGING_*_NATIVE variables
(From OE-Core rev: d78921e91ea1caf0154d544496a8aeabc2ec543d)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/image-prelink.bbclass | 4 |
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 () { | |||
19 | 19 | ||
20 | # We need a prelink conf on the filesystem, add one if it's missing | 20 | # We need a prelink conf on the filesystem, add one if it's missing |
21 | if [ ! -e ${IMAGE_ROOTFS}${sysconfdir}/prelink.conf ]; then | 21 | if [ ! -e ${IMAGE_ROOTFS}${sysconfdir}/prelink.conf ]; then |
22 | cp ${STAGING_DIR_NATIVE}${sysconfdir_native}/prelink.conf \ | 22 | cp ${STAGING_ETCDIR_NATIVE}/prelink.conf \ |
23 | ${IMAGE_ROOTFS}${sysconfdir}/prelink.conf | 23 | ${IMAGE_ROOTFS}${sysconfdir}/prelink.conf |
24 | dummy_prelink_conf=true; | 24 | dummy_prelink_conf=true; |
25 | else | 25 | else |
@@ -36,7 +36,7 @@ prelink_image () { | |||
36 | dynamic_loader=$(linuxloader) | 36 | dynamic_loader=$(linuxloader) |
37 | 37 | ||
38 | # prelink! | 38 | # prelink! |
39 | ${STAGING_DIR_NATIVE}${sbindir_native}/prelink --root ${IMAGE_ROOTFS} -amR -N -c ${sysconfdir}/prelink.conf --dynamic-linker $dynamic_loader | 39 | ${STAGING_SBINDIR_NATIVE}/prelink --root ${IMAGE_ROOTFS} -amR -N -c ${sysconfdir}/prelink.conf --dynamic-linker $dynamic_loader |
40 | 40 | ||
41 | # Remove the prelink.conf if we had to add it. | 41 | # Remove the prelink.conf if we had to add it. |
42 | if [ "$dummy_prelink_conf" = "true" ]; then | 42 | if [ "$dummy_prelink_conf" = "true" ]; then |