[oe-commits] [openembedded-core] 01/02: populate_sdk_base: fix support for changing SDKMACHINE settings

[git at git.openembedded.org]

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit d7a06b53af0066bd12f5f42e10e82b307fd069ce
Author: Joshua Lock <joshua.g.lock at intel.com>
AuthorDate: Wed Sep 21 10:26:22 2016 +0100

    populate_sdk_base: fix support for changing SDKMACHINE settings
    
    Include SDKMACHINE in the tasks stamp information and the name of
    the sstate-inputdirs so that changing SDKMACHINE doesn't result in
    valid output of the task being deleted when SDKMACHINE is changed.
    
    Without this patch changing SDKMACHINE and building an SDK resulted
    in toolchain installers for other  SDKMACHINE's being deleted from
    the deploy directoy.
    
    [YOCTO #10275]
    
    Signed-off-by: Joshua Lock <joshua.g.lock at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/populate_sdk_base.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index 6fe0b37..ce12f27 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -26,7 +26,7 @@ SDK_DIR = "${WORKDIR}/sdk"
 SDK_OUTPUT = "${SDK_DIR}/image"
 SDK_DEPLOY = "${DEPLOY_DIR}/sdk"
 
-SDKDEPLOYDIR = "${WORKDIR}/deploy-${PN}-populate-sdk"
+SDKDEPLOYDIR = "${WORKDIR}/${SDKMACHINE}-deploy-${PN}-populate-sdk"
 
 B_task-populate-sdk = "${SDK_DIR}"
 
@@ -125,7 +125,7 @@ SSTATE_SKIP_CREATION_task-populate-sdk = '1'
 do_populate_sdk[cleandirs] = "${SDKDEPLOYDIR}"
 do_populate_sdk[sstate-inputdirs] = "${SDKDEPLOYDIR}"
 do_populate_sdk[sstate-outputdirs] = "${SDK_DEPLOY}"
-do_populate_sdk[stamp-extra-info] = "${MACHINE}"
+do_populate_sdk[stamp-extra-info] = "${MACHINE}${SDKMACHINE}"
 
 fakeroot create_sdk_files() {
 	cp ${COREBASE}/scripts/relocate_sdk.py ${SDK_OUTPUT}/${SDKPATH}/

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.