From e29c4609c9c316cf8e37c2f3d977cc3fe23f2d27 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Wed, 21 Sep 2016 10:26:22 +0100 Subject: 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] (From OE-Core rev: d7a06b53af0066bd12f5f42e10e82b307fd069ce) Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- 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 6fe0b3704a..ce12f275bb 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}/ -- cgit v1.2.3-54-g00ecf