[OE-core] [PATCH 1/9] tar: fix build

[Richard Purdie]

On Wed, 2012-05-23 at 04:44 -0600, Gary Thomas wrote:
> On 2012-05-22 18:05, nitin.a.kamble at intel.com wrote:
> > From: Nitin A Kamble<nitin.a.kamble at intel.com>
> >
> > Avoid this error:
> > | rmdir: failed to remove `/srv/home/nitin/builds/build-gcc47/tmp/work/i586-poky-linux/tar-1.26-r1/image/usr/sbin/': No such file or directory
> > NOTE: package tar-1.26-r1: task do_install: Failed
> >
> > no PR bump as no change in the output.
> >
> > Signed-off-by: Nitin A Kamble<nitin.a.kamble at intel.com>
> > ---
> >   meta/recipes-extended/tar/tar.inc |    8 ++++++--
> >   1 files changed, 6 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta/recipes-extended/tar/tar.inc b/meta/recipes-extended/tar/tar.inc
> > index 0533b82..5c2325a 100644
> > --- a/meta/recipes-extended/tar/tar.inc
> > +++ b/meta/recipes-extended/tar/tar.inc
> > @@ -18,8 +18,12 @@ do_install () {
> >   do_install_extra () {
> >       install -d ${D}${base_bindir}
> >       mv ${D}${bindir}/tar ${D}${base_bindir}/tar.${PN}
> > -    rmdir ${D}${bindir}/
> > -    rmdir ${D}${sbindir}/
> > +    if [ -d ${D}${bindir}/ ] ; then
> > +        rmdir ${D}${bindir}/
> > +    fi
> > +    if [ -d ${D}${sbindir}/ ] ; then
> > +        rmdir ${D}${sbindir}/
> > +    fi
> >       mv ${D}${libexecdir}/rmt ${D}${libexecdir}/rmt.${PN}
> >   }
> >
> 
> Why not just use
>    rm -fr ${D}${bindir}
> etc?  No need for all the extra testing...

I've mentioned this once before however I'll do so again. I think these
empty directories were a bug in automake. It looks like automake has
fixed that problem and no longer generates them. I think the correct
thing to do is simply remove the rmdir.

The reason we used rmdir instead of rm is we wanted to know if these
suddenly started containing files, not silently delete them.

Cheers,

Richard