| Submitter | Phil Blundell |
|---|---|
| Date | May 17, 2011, 11:51 a.m. |
| Message ID | <1305633118.2429.188.camel@phil-desktop> |
| Download | mbox | patch |
| Permalink | /patch/4233/ |
| State | New, archived |
| Headers | show |
Comments
On Tue, 2011-05-17 at 12:51 +0100, Phil Blundell wrote: > --- > meta/classes/image-prelink.bbclass | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/meta/classes/image-prelink.bbclass b/meta/classes/image-prelink.bbclass > index ee0951c..cefd983 100644 > --- a/meta/classes/image-prelink.bbclass > +++ b/meta/classes/image-prelink.bbclass > @@ -21,7 +21,7 @@ prelink_image () { > fi > > # prelink! > - ${STAGING_DIR_NATIVE}/usr/sbin/prelink --root ${IMAGE_ROOTFS} -amR > + ${STAGING_DIR_NATIVE}${sbindir}/prelink --root ${IMAGE_ROOTFS} -amR > > # Remove the prelink.conf if we had to add it. > if [ "$dummy_prelink_conf" == "true" ]; then I suspect this should be ${sbindir_native} there? Cheers, Richard
On Tue, 2011-05-17 at 13:02 +0100, Richard Purdie wrote: > On Tue, 2011-05-17 at 12:51 +0100, Phil Blundell wrote: > > --- > > meta/classes/image-prelink.bbclass | 2 +- > > 1 files changed, 1 insertions(+), 1 deletions(-) > > > > diff --git a/meta/classes/image-prelink.bbclass b/meta/classes/image-prelink.bbclass > > index ee0951c..cefd983 100644 > > --- a/meta/classes/image-prelink.bbclass > > +++ b/meta/classes/image-prelink.bbclass > > @@ -21,7 +21,7 @@ prelink_image () { > > fi > > > > # prelink! > > - ${STAGING_DIR_NATIVE}/usr/sbin/prelink --root ${IMAGE_ROOTFS} -amR > > + ${STAGING_DIR_NATIVE}${sbindir}/prelink --root ${IMAGE_ROOTFS} -amR > > > > # Remove the prelink.conf if we had to add it. > > if [ "$dummy_prelink_conf" == "true" ]; then > > I suspect this should be ${sbindir_native} there? Ah yes, I guess it should. I'll verify that that works and send a new patch later. On a similar subject, image-prelink also seems to assume that ${sysconfdir} == ${sysconfdir_native} == "/etc". That isn't actually causing me a problem at the moment, because the assumption does happen to hold for my configuration, but I guess it could do with fixing at some point. p.
Patch
diff --git a/meta/classes/image-prelink.bbclass b/meta/classes/image-prelink.bbclass index ee0951c..cefd983 100644 --- a/meta/classes/image-prelink.bbclass +++ b/meta/classes/image-prelink.bbclass @@ -21,7 +21,7 @@ prelink_image () { fi # prelink! - ${STAGING_DIR_NATIVE}/usr/sbin/prelink --root ${IMAGE_ROOTFS} -amR + ${STAGING_DIR_NATIVE}${sbindir}/prelink --root ${IMAGE_ROOTFS} -amR # Remove the prelink.conf if we had to add it. if [ "$dummy_prelink_conf" == "true" ]; then