[OE-core] [PATCH] staging: fix logic of guessing dependency manifest file in extend_recipe_sysroot

[Khem Raj]

On 1/24/17 5:50 AM, Maciej Borzecki wrote:
> Recipe sysroots introduced a change where dependencies ending with "-cross" also
> count as native tools and (see setscene_depvalid() for details).
> 
> The same logic was missing from extend_recipe_sysroot(), hence for depency named
> `go-cross` the manifest file would default to
> `manifest-allarch-go-cross.populate_sysroot`, while the correct name is
> `manifest-x86_64_arm-go-cross.populate_sysroot`
> 
> Signed-off-by: Maciej Borzecki <maciej.borzecki at rndity.com>
> ---
>  meta/classes/staging.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
> index fc387eaf4bb52971e111ae7deac7d7d6fc389337..efea450e4f73661366d0929d5c39e42bfe9f8e8b 100644
> --- a/meta/classes/staging.bbclass
> +++ b/meta/classes/staging.bbclass
> @@ -521,7 +521,7 @@ python extend_recipe_sysroot() {
>              native = True
>          elif c.startswith("nativesdk-"):
>              manifest = d2.expand("${SSTATE_MANIFESTS}/manifest-${SDK_ARCH}_${SDK_OS}-%s.populate_sysroot" % c)
> -        elif "-cross-" in c:
> +        elif "-cross-" in c or c.endswith("-cross"):

Perhaps you can change the go cross recipe to use something like

PN = "go-cross-${TARGET_ARCH}"

>              manifest = d2.expand("${SSTATE_MANIFESTS}/manifest-${BUILD_ARCH}_${TARGET_ARCH}-%s.populate_sysroot" % c)
>              native = True
>          elif "-crosssdk" in c:
>