[OE-core] [oe-commits] Richard Purdie : bitbake.conf/sanity: Separate versions and PN stamp components into separate directories for WORKDIR and STAMP

[Richard Purdie]

On Tue, 2012-11-20 at 20:26 +0100, Martin Jansa wrote:
> On Tue, Nov 20, 2012 at 03:29:56PM +0000, git at git.openembedded.org wrote:
> > Module: openembedded-core.git
> > Branch: master
> > Commit: 05075cf3138d1c61f5cf4fe0e1a4587acc00c692
> > URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=05075cf3138d1c61f5cf4fe0e1a4587acc00c692
> > 
> > Author: Richard Purdie <richard.purdie at linuxfoundation.org>
> > Date:   Fri Nov 16 15:35:53 2012 +0000
> > 
> > bitbake.conf/sanity: Separate versions and PN stamp components into separate directories for WORKDIR and STAMP
> > 
> > This means some of the hacks we have to tell where the package name ends and
> > the version starts in the directory layout becomes obsolete, simplifying the
> > work of some of the cleanup scripts. It also makes the layout slightly more
> > intuitive to the user.
> > 
> > It does force a rebuild onto the user but it will reuse sstate successfully.
> > 
> > Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
> > 
> > ---
> > 
> >  meta/classes/sanity.bbclass |    2 ++
> >  meta/conf/abi_version.conf  |    2 +-
> >  meta/conf/bitbake.conf      |    6 +++---
> >  3 files changed, 6 insertions(+), 4 deletions(-)
> > 
> > diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
> > index 3806bc5..5b4f070 100644
> > --- a/meta/classes/sanity.bbclass
> > +++ b/meta/classes/sanity.bbclass
> > @@ -605,6 +605,8 @@ def check_sanity(sanity_data):
> >              f.write(current_abi)
> >          elif abi == "7" and current_abi == "8":
> >              messages = messages + "Your configuration is using stamp files including the sstate hash but your build directory was built with stamp files that do not include this.\nTo continue, either rebuild or switch back to the OEBasic signature handler with BB_SIGNATURE_HANDLER = 'OEBasic'.\n"
> > +        elif (abi != current_abi and current_abi == "9"):
> > +            messages = messages + "The layout of the TMPDIR STAMPS directory has changed. Please clean out TMPDIR and rebuild (sstate will be still be valid and reused)\n"
> 
> The part about valid and reused sstate doesn't seem to be true, if I compare 
> sstate checksums with and without this patch (current master and master with 
> this patch reverted), they are different:

They are indeed, sorry about that :/.

> > -STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PN}-${EXTENDPE}${PV}-${PR}"
> > -STAMPCLEAN = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PN}-[0-9]*-*"
> > -WORKDIR = "${TMPDIR}/work/${MULTIMACH_TARGET_SYS}/${PF}"
> > +STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PN}/${EXTENDPE}${PV}-${PR}"
> > +STAMPCLEAN = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PN}/*-*"
> > +WORKDIR = "${TMPDIR}/work/${MULTIMACH_TARGET_SYS}/${PN}/${EXTENDPE}${PV}-${PR}"
> 
> This breaks paths in all PN-dbg, as reported on previous patch doing this with
> WORKDIR:
> http://lists.linuxtogo.org/pipermail/openembedded-core/2012-September/030031.html

I pushed a fix for this earlier in the week, thanks for reminding me
about that problem, I had forgotten about it :(.

Cheers,

Richard