[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2598/8267] buildtools-tarball: improve stamp independence

[Emmanuele Bassi <ebassi src gnome org>]

commit e08640b409d7e9a10c9e7e37cc712145e7050dd9
Author: Joshua Lock <joshua g lock intel com>
Date:   Thu Sep 22 14:05:51 2016 +0100

    buildtools-tarball: improve stamp independence
    
    buildtools-tarball shouldn't be regenerated when MACHINE changes,
    nor should variants for other SDKMACHINE be removed from the deploy
    directory when SDKMACHINE changes.
    
    Remove target architecture dependencies so that deploy artefacts
    can overlap.
    
    (From OE-Core rev: b7d1a310f6b880e92b124a78af3c948abaab4236)
    
    Signed-off-by: Joshua Lock <joshua g lock intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/recipes-core/meta/buildtools-tarball.bb |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb
index 2e738e6..da18c09 100644
--- a/meta/recipes-core/meta/buildtools-tarball.bb
+++ b/meta/recipes-core/meta/buildtools-tarball.bb
@@ -28,10 +28,13 @@ TOOLCHAIN_HOST_TASK ?= "\
 
 MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}"
 PACKAGE_ARCH = "${SDK_ARCH}"
+PACKAGE_ARCHS = ""
+TARGET_ARCH = "none"
+TARGET_OS = "none"
 
 SDK_PACKAGE_ARCHS += "buildtools-dummy-${SDKPKGSUFFIX}"
 
-TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-buildtools-nativesdk-standalone-${DISTRO_VERSION}"
+TOOLCHAIN_OUTPUTNAME ?= "${SDK_ARCH}-buildtools-nativesdk-standalone-${DISTRO_VERSION}"
 
 SDK_TITLE = "Build tools"
 
@@ -41,10 +44,18 @@ EXCLUDE_FROM_WORLD = "1"
 
 inherit meta
 inherit populate_sdk
-inherit toolchain-scripts
+inherit toolchain-scripts-base
+inherit nopackages
+
+deltask install
+deltask package
+deltask packagedata
+deltask populate_sysroot
 
 do_populate_sdk[stamp-extra-info] = "${SDKMACHINE}"
 
+REAL_MULTIMACH_TARGET_SYS = "none"
+
 create_sdk_files_append () {
        rm -f ${SDK_OUTPUT}/${SDKPATH}/site-config-*
        rm -f ${SDK_OUTPUT}/${SDKPATH}/environment-setup-*