summaryrefslogtreecommitdiffstats
path: root/meta/classes/image-prelink.bbclass
diff options
context:
space:
mode:
authorPhil Blundell <pb@pbcl.net>2011-05-17 15:52:59 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-17 16:06:38 (GMT)
commit7cc59107f944a2a786cf93e8589edf7dfd0f2d70 (patch)
tree19425bb00e631305b482551d040180f970bb2283 /meta/classes/image-prelink.bbclass
parent63f8d85ad579665233af7de28c59e2f5fb8896ac (diff)
downloadpoky-7cc59107f944a2a786cf93e8589edf7dfd0f2d70.tar.gz
image-prelink: remove hardcoded path assumptions, don't generate cache file
Pass -N option to prelink so that no cache file is generated (obviates need for deleting it afterwards). Use symbolic names, ${sysconfdir} et al., rather than hardcoded paths. Pass explicit -c option to prelink in case ${sysconfdir} and ${sysconfdir_native} are different. (From OE-Core rev: 78a3cc9e8588e37badcd2ea02d2cf3b5a25ee5b8) Signed-off-by: Phil Blundell <philb@gnu.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image-prelink.bbclass')
-rw-r--r--meta/classes/image-prelink.bbclass13
1 files changed, 5 insertions, 8 deletions
diff --git a/meta/classes/image-prelink.bbclass b/meta/classes/image-prelink.bbclass
index ee0951c..350c29d 100644
--- a/meta/classes/image-prelink.bbclass
+++ b/meta/classes/image-prelink.bbclass
@@ -12,25 +12,22 @@ prelink_image () {
12 echo "Size before prelinking $pre_prelink_size." 12 echo "Size before prelinking $pre_prelink_size."
13 13
14 # We need a prelink conf on the filesystem, add one if it's missing 14 # We need a prelink conf on the filesystem, add one if it's missing
15 if [ ! -e ${IMAGE_ROOTFS}/etc/prelink.conf ]; then 15 if [ ! -e ${IMAGE_ROOTFS}${sysconfdir}/prelink.conf ]; then
16 cp ${STAGING_DIR_NATIVE}/etc/prelink.conf \ 16 cp ${STAGING_DIR_NATIVE}${sysconfdir_native}/prelink.conf \
17 ${IMAGE_ROOTFS}/etc/prelink.conf 17 ${IMAGE_ROOTFS}${sysconfdir}/prelink.conf
18 dummy_prelink_conf=true; 18 dummy_prelink_conf=true;
19 else 19 else
20 dummy_prelink_conf=false; 20 dummy_prelink_conf=false;
21 fi 21 fi
22 22
23 # prelink! 23 # prelink!
24 ${STAGING_DIR_NATIVE}/usr/sbin/prelink --root ${IMAGE_ROOTFS} -amR 24 ${STAGING_DIR_NATIVE}${sbindir_native}/prelink --root ${IMAGE_ROOTFS} -amR -N -c ${sysconfdir}/prelink.conf
25 25
26 # Remove the prelink.conf if we had to add it. 26 # Remove the prelink.conf if we had to add it.
27 if [ "$dummy_prelink_conf" == "true" ]; then 27 if [ "$dummy_prelink_conf" == "true" ]; then
28 rm -f ${IMAGE_ROOTFS}/etc/prelink.conf 28 rm -f ${IMAGE_ROOTFS}${sysconfdir}/prelink.conf
29 fi 29 fi
30 30
31 # Cleanup temporary file, it's not needed...
32 rm -f ${IMAGE_ROOTFS}/etc/prelink.cache
33
34 pre_prelink_size=`du -ks ${IMAGE_ROOTFS} | awk '{size = $1 ; print size }'` 31 pre_prelink_size=`du -ks ${IMAGE_ROOTFS} | awk '{size = $1 ; print size }'`
35 echo "Size after prelinking $pre_prelink_size." 32 echo "Size after prelinking $pre_prelink_size."
36} 33}