summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-23 17:05:16 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-23 17:06:08 (GMT)
commitbd933a3f299503d9013f671f121c78624acf60df (patch)
tree31233759695e936499b524e2436a93dd590fc973
parentb75ed251a3ad6ab87853e75373a25b8782a2cbd9 (diff)
downloadpoky-uninative-1.4.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>
-rw-r--r--meta/recipes-core/meta/buildtools-tarball.bb4
-rw-r--r--meta/recipes-core/meta/uninative-tarball.bb4
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 ?= "\
27 " 27 "
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}_${SDK_OS}"
31PACKAGE_ARCHS = "" 31PACKAGE_ARCHS = ""
32TARGET_ARCH = "none" 32TARGET_ARCH = "none"
33TARGET_OS = "none" 33TARGET_OS = "none"
@@ -52,7 +52,7 @@ deltask package
52deltask packagedata 52deltask packagedata
53deltask populate_sysroot 53deltask populate_sysroot
54 54
55do_populate_sdk[stamp-extra-info] = "${SDKMACHINE}" 55do_populate_sdk[stamp-extra-info] = "${PACKAGE_ARCH}"
56 56
57REAL_MULTIMACH_TARGET_SYS = "none" 57REAL_MULTIMACH_TARGET_SYS = "none"
58 58
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 = "\
17INHIBIT_DEFAULT_DEPS = "1" 17INHIBIT_DEFAULT_DEPS = "1"
18 18
19MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}" 19MULTIMACH_TARGET_SYS = "${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}"
20PACKAGE_ARCH = "${SDK_ARCH}" 20PACKAGE_ARCH = "${SDK_ARCH}_${SDK_OS}"
21PACKAGE_ARCHS = "" 21PACKAGE_ARCHS = ""
22TARGET_ARCH = "none" 22TARGET_ARCH = "none"
23TARGET_OS = "none" 23TARGET_OS = "none"
@@ -37,7 +37,7 @@ deltask package
37deltask packagedata 37deltask packagedata
38deltask populate_sysroot 38deltask populate_sysroot
39 39
40do_populate_sdk[stamp-extra-info] = "${SDKMACHINE}" 40do_populate_sdk[stamp-extra-info] = "${PACKAGE_ARCH}"
41 41
42SDK_DEPENDS += "patchelf-native" 42SDK_DEPENDS += "patchelf-native"
43 43