[OE-core] [PATCH] classes: Be consistent about sstate-inputdirs/outputdirs ending with '/'

[Richard Purdie]

On Wed, 2012-11-14 at 16:22 +0100, Martin Jansa wrote:
> On Wed, Nov 14, 2012 at 04:09:45PM +0100, Martin Jansa wrote:
> > On Tue, Nov 13, 2012 at 02:05:00PM +0000, Richard Purdie wrote:
> > > If sstate-inputdirs and sstate-outputdirs don't match with ending '/'
> > > characters, the manifest file can end up corrupted. This change
> > > ensures the metadata is consistent in ending do_populate_root tasks
> > > with this character to avoid manifest file corruption.
> > > 
> > > diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
> > > index ff6556c..1ac1db6 100644
> > > --- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc
> > > +++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
> > > @@ -74,6 +74,6 @@ sysroot_stage_all() {
> > >  	mv ${SYSROOT_DESTDIR}${target_libdir}/* ${SYSROOT_DESTDIR}${STAGING_DIR_TARGET}${target_libdir}/ || true
> > >  }
> > >  
> > > -do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_HOST} ${SYSROOT_DESTDIR}/${STAGING_DIR_TARGET}/${target_base_libdir}"
> > > -do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_HOST} ${STAGING_DIR_TCBOOTSTRAP}/${target_base_libdir}"
> > > +do_populate_sysroot[sstate-inputdirs] = "${SYSROOT_DESTDIR}/${STAGING_DIR_HOST}/ ${SYSROOT_DESTDIR}/${STAGING_DIR_TARGET}/${target_base_libdir}/"
> > > +do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_HOST}/ ${STAGING_DIR_TCBOOTSTRAP}/${target_base_libdir}/"
> > 
> > Not sure if it can be caused by this, but building from scratch fails
> > today with:
> > 
> 
> with some added debug output it looks like trying to move the same directory twice:
> WARNING: Moving
> /OE/oe-core/tmp-eglibc/work/x86_64-oe-linux/gcc-cross-initial-4.7.2-r13/sstate-install-populate-sysroot/
> to
> /OE/oe-core/tmp-eglibc/work/x86_64-oe-linux/gcc-cross-initial-4.7.2-r13/sysroot-destdir///OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/
> WARNING: Moving
> /OE/oe-core/tmp-eglibc/work/x86_64-oe-linux/gcc-cross-initial-4.7.2-r13/sstate-install-populate-sysroot/
> to
> /OE/oe-core/tmp-eglibc/work/x86_64-oe-linux/gcc-cross-initial-4.7.2-r13/sysroot-destdir///OE/oe-core/tmp-eglibc/sysroots/qemux86-64//lib/
> ERROR: Error executing a python function in
> /OE/oe-core/openembedded-core/meta/recipes-devtools/gcc/gcc-cross-initial_4.7.bb:

There is something missing from after sstate-install-populate-sysroot/.
I've pushed a fix into master. Its only appearing when installing from
sstate.

Cheers,

Richard