diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-23 18:05:16 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-23 18:06:08 +0100 |
commit | bd933a3f299503d9013f671f121c78624acf60df (patch) | |
tree | 31233759695e936499b524e2436a93dd590fc973 /meta/recipes-core/meta/buildtools-tarball.bb | |
parent | b75ed251a3ad6ab87853e75373a25b8782a2cbd9 (diff) | |
download | poky-a7d2b680f170b7d43af3e5d7a9956f298e16eeca.tar.gz |
buildtools/uninative-tarball: Fix deployment overlap issuesuninative-1.4
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>
Diffstat (limited to 'meta/recipes-core/meta/buildtools-tarball.bb')
-rw-r--r-- | meta/recipes-core/meta/buildtools-tarball.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index da18c09fce..5808c95d81 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb | |||
@@ -27,7 +27,7 @@ TOOLCHAIN_HOST_TASK ?= "\ | |||
27 | " | 27 | " |
28 | 28 | ||
29 | MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}" | 29 | MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}" |
30 | PACKAGE_ARCH = "${SDK_ARCH}" | 30 | PACKAGE_ARCH = "${SDK_ARCH}_${SDK_OS}" |
31 | PACKAGE_ARCHS = "" | 31 | PACKAGE_ARCHS = "" |
32 | TARGET_ARCH = "none" | 32 | TARGET_ARCH = "none" |
33 | TARGET_OS = "none" | 33 | TARGET_OS = "none" |
@@ -52,7 +52,7 @@ deltask package | |||
52 | deltask packagedata | 52 | deltask packagedata |
53 | deltask populate_sysroot | 53 | deltask populate_sysroot |
54 | 54 | ||
55 | do_populate_sdk[stamp-extra-info] = "${SDKMACHINE}" | 55 | do_populate_sdk[stamp-extra-info] = "${PACKAGE_ARCH}" |
56 | 56 | ||
57 | REAL_MULTIMACH_TARGET_SYS = "none" | 57 | REAL_MULTIMACH_TARGET_SYS = "none" |
58 | 58 | ||