[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2654/8267] buildtools/uninative-tarball: Fix deployment overlap issues

[Emmanuele Bassi <ebassi src gnome org>]

commit bd933a3f299503d9013f671f121c78624acf60df
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Fri Sep 23 18:05:16 2016 +0100

    buildtools/uninative-tarball: Fix deployment overlap issues
    
    We still have problems where deploying SDKMACHINE=i686 can cause removal
    of SDKMACHINE=x86_64 artefacts.
    
    The reason is that x86_64 is a BUILD_ARCH as well as an SDK_ARCH and
    the manifest namespaces overlap. To fix this, set PACKAGE_ARCH and
    the stamp-extra-into to include SDK_OS. SDK_OS may not be entirely correct
    but it is what sstate.bbclass uses for nativesdk and fixing that is
    a separate issue.
    
    This is confirmed to resolve artefact problems on the AB which have been
    delaying a new uninative release.
    
    (From OE-Core rev: 1dbc6ec4ca061570d2482c9abebcf720298db9b7)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-core/meta/buildtools-tarball.bb |    4 ++--
 meta/recipes-core/meta/uninative-tarball.bb  |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb
index da18c09..5808c95 100644
--- a/meta/recipes-core/meta/buildtools-tarball.bb
+++ b/meta/recipes-core/meta/buildtools-tarball.bb
@@ -27,7 +27,7 @@ TOOLCHAIN_HOST_TASK ?= "\
     "
 
 MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}"
-PACKAGE_ARCH = "${SDK_ARCH}"
+PACKAGE_ARCH = "${SDK_ARCH}_${SDK_OS}"
 PACKAGE_ARCHS = ""
 TARGET_ARCH = "none"
 TARGET_OS = "none"
@@ -52,7 +52,7 @@ deltask package
 deltask packagedata
 deltask populate_sysroot
 
-do_populate_sdk[stamp-extra-info] = "${SDKMACHINE}"
+do_populate_sdk[stamp-extra-info] = "${PACKAGE_ARCH}"
 
 REAL_MULTIMACH_TARGET_SYS = "none"
 
diff --git a/meta/recipes-core/meta/uninative-tarball.bb b/meta/recipes-core/meta/uninative-tarball.bb
index 0dad974..e203a83 100644
--- a/meta/recipes-core/meta/uninative-tarball.bb
+++ b/meta/recipes-core/meta/uninative-tarball.bb
@@ -17,7 +17,7 @@ TOOLCHAIN_HOST_TASK = "\
 INHIBIT_DEFAULT_DEPS = "1"
 
 MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}"
-PACKAGE_ARCH = "${SDK_ARCH}"
+PACKAGE_ARCH = "${SDK_ARCH}_${SDK_OS}"
 PACKAGE_ARCHS = ""
 TARGET_ARCH = "none"
 TARGET_OS = "none"
@@ -37,7 +37,7 @@ deltask package
 deltask packagedata
 deltask populate_sysroot
 
-do_populate_sdk[stamp-extra-info] = "${SDKMACHINE}"
+do_populate_sdk[stamp-extra-info] = "${PACKAGE_ARCH}"
 
 SDK_DEPENDS += "patchelf-native"