[OE-core] [PATCH 01/46] sanity.bbclass: Use SSTATE_MANIFESTS instead of hard coding sstate-control
Richard Purdie
richard.purdie at linuxfoundation.org
Mon Apr 4 11:45:43 UTC 2011
On Thu, 2011-03-31 at 21:28 -0700, Khem Raj wrote:
> This helps when SSTATE_MANIFESTS is overridden by external layers
>
> Signed-off-by: Khem Raj <raj.khem at gmail.com>
> ---
> meta/classes/sanity.bbclass | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
> index 639e1ea..500a1b2 100644
> --- a/meta/classes/sanity.bbclass
> +++ b/meta/classes/sanity.bbclass
> @@ -321,7 +321,7 @@ def check_sanity(e):
> messages = messages + "Staging layout has changed. The cross directory has been deprecated and cross packages are now built under the native sysroot.\nThis requires a rebuild.\n"
> elif abi == "5" and current_abi == "6":
> bb.note("Converting staging layout from version 5 to layout version 6")
> - os.system(bb.data.expand("mv ${TMPDIR}/pstagelogs ${TMPDIR}/sstate-control", e.data))
> + os.system(bb.data.expand("mv ${TMPDIR}/pstagelogs ${SSTATE_MANIFESTS}", e.data))
> f = file(abifile, "w")
> f.write(current_abi)
> elif (abi != current_abi):
Merged to master, thanks.
Richard
More information about the Openembedded-core
mailing list