From 1dbc6ec4ca061570d2482c9abebcf720298db9b7 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 23 Sep 2016 18:05:16 +0100 Subject: 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. Signed-off-by: Richard Purdie --- 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 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 ?= "\ " 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 0dad974238..e203a8322e 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" -- cgit 1.2.3-korg