Patchwork meta/classes/image-prelink.bbclass point prelink config to ${IMAGE_ROOTFS} and remove --root option

login
register
mail settings
Submitter Nathan West
Date July 17, 2012, 11:53 p.m.
Message ID <CACFtY+JeSFdNbudJmkRp9wsA6Spvc-O7MM7bMA+Nr2fz_ticSg@mail.gmail.com>
Download mbox | patch
Permalink /patch/32331/
State New
Headers show

Comments

Nathan West - July 17, 2012, 11:53 p.m.
The --root option doesn't work and isn't documented anywhere I could find.
In a previous
line the config is created in ${IMAGE_ROOTFS}${sysconfdir}/prelink.conf,
without the
${IMAGE_ROOTFS} we point to /etc/prelink.conf (on the native machine).

Signed-off-by: westn <nathan.west@ieee.org>
---
 meta/classes/image-prelink.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

  if [ "$dummy_prelink_conf" = "true" ]; then

Patch

diff --git a/meta/classes/image-prelink.bbclass
b/meta/classes/image-prelink.bbclass
index 53ef47e..2d62f03 100644
--- a/meta/classes/image-prelink.bbclass
+++ b/meta/classes/image-prelink.bbclass
@@ -21,7 +21,7 @@  prelink_image () {
  fi

  # prelink!
- ${STAGING_DIR_NATIVE}${sbindir_native}/prelink --root ${IMAGE_ROOTFS}
-amR -N -c ${sysconfdir}/prelink.conf
+ ${STAGING_DIR_NATIVE}${sbindir_native}/prelink ${IMAGE_ROOTFS} -amR -N -c
${IMAGE_ROOTFS}${sysconfdir}/prelink.conf

  # Remove the prelink.conf if we had to add it.