summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2016-09-22 14:05:51 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-23 14:56:39 +0100
commite08640b409d7e9a10c9e7e37cc712145e7050dd9 (patch)
tree2bca94f4f29f6b1f05f3bcd1d977be6d08a65979
parentcb1ffb835f9ee3a10314016d7356d843a22736dd (diff)
downloadpoky-e08640b409d7e9a10c9e7e37cc712145e7050dd9.tar.gz
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>
-rw-r--r--meta/recipes-core/meta/buildtools-tarball.bb15
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 2e738e6118..da18c09fce 100644
--- a/meta/recipes-core/meta/buildtools-tarball.bb
+++ b/meta/recipes-core/meta/buildtools-tarball.bb
@@ -28,10 +28,13 @@ TOOLCHAIN_HOST_TASK ?= "\
28 28
29MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}" 29MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}"
30PACKAGE_ARCH = "${SDK_ARCH}" 30PACKAGE_ARCH = "${SDK_ARCH}"
31PACKAGE_ARCHS = ""
32TARGET_ARCH = "none"
33TARGET_OS = "none"
31 34
32SDK_PACKAGE_ARCHS += "buildtools-dummy-${SDKPKGSUFFIX}" 35SDK_PACKAGE_ARCHS += "buildtools-dummy-${SDKPKGSUFFIX}"
33 36
34TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-buildtools-nativesdk-standalone-${DISTRO_VERSION}" 37TOOLCHAIN_OUTPUTNAME ?= "${SDK_ARCH}-buildtools-nativesdk-standalone-${DISTRO_VERSION}"
35 38
36SDK_TITLE = "Build tools" 39SDK_TITLE = "Build tools"
37 40
@@ -41,10 +44,18 @@ EXCLUDE_FROM_WORLD = "1"
41 44
42inherit meta 45inherit meta
43inherit populate_sdk 46inherit populate_sdk
44inherit toolchain-scripts 47inherit toolchain-scripts-base
48inherit nopackages
49
50deltask install
51deltask package
52deltask packagedata
53deltask populate_sysroot
45 54
46do_populate_sdk[stamp-extra-info] = "${SDKMACHINE}" 55do_populate_sdk[stamp-extra-info] = "${SDKMACHINE}"
47 56
57REAL_MULTIMACH_TARGET_SYS = "none"
58
48create_sdk_files_append () { 59create_sdk_files_append () {
49 rm -f ${SDK_OUTPUT}/${SDKPATH}/site-config-* 60 rm -f ${SDK_OUTPUT}/${SDKPATH}/site-config-*
50 rm -f ${SDK_OUTPUT}/${SDKPATH}/environment-setup-* 61 rm -f ${SDK_OUTPUT}/${SDKPATH}/environment-setup-*