On Fri, Sep 21, 2012 at 7:23 AM, Richard Purdie
<[email protected]> wrote:
> Signed-off-by: Richard Purdie <[email protected]>
> ---
>
> I haven't made my mind up about this layout change idea yet. I thought
> I'd put it out there for feedback. It would make the STAMPCLEAN function
> more accurate/easier. I'll follow this email with the WORKDIR
> counterpart we could consider which would make some of the cleanup
> scripts easier.
>
agreed looks ok my clean build went fine.
> diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
> index 385d733..1b7125d 100644
> --- a/meta/classes/sanity.bbclass
> +++ b/meta/classes/sanity.bbclass
> @@ -540,6 +540,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"
> elif (abi != current_abi):
> # Code to convert from one ABI to another could go here if
> possible.
> messages = messages + "Error, TMPDIR has changed its layout
> version number (%s to %s) and you need to either rebuild, revert or adjust it
> at your own risk.\n" % (abi, current_abi)
> diff --git a/meta/conf/abi_version.conf b/meta/conf/abi_version.conf
> index 83b668a..e8cf9a3 100644
> --- a/meta/conf/abi_version.conf
> +++ b/meta/conf/abi_version.conf
> @@ -4,4 +4,4 @@
> # that breaks the format and have been previously discussed on the mailing
> list
> # with general agreement from the core team.
> #
> -OELAYOUT_ABI = "8"
> +OELAYOUT_ABI = "9"
> diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
> index 9b41749..4b6fdb7 100644
> --- a/meta/conf/bitbake.conf
> +++ b/meta/conf/bitbake.conf
> @@ -332,8 +332,8 @@ GITDIR = "${CO_DIR}/git2"
> BZRDIR = "${CO_DIR}/bzr"
> HGDIR = "${CO_DIR}/hg"
>
> -STAMP =
> "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PN}-${EXTENDPE}${PV}-${PR}"
> -STAMPCLEAN = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PN}-[0-9]*-*"
> +STAMP =
> "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PN}/${EXTENDPE}${PV}-${PR}"
> +STAMPCLEAN = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PN}/*-*"
> WORKDIR = "${TMPDIR}/work/${MULTIMACH_TARGET_SYS}/${PF}"
> T = "${WORKDIR}/temp"
> D = "${WORKDIR}/image"
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> [email protected]
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
