summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2016-09-21 10:26:22 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-21 18:12:09 +0100
commite29c4609c9c316cf8e37c2f3d977cc3fe23f2d27 (patch)
tree9cbc93be10e26889052ddeca2d489300c4908df9
parenta767c78abeb19a9d730e3c9b1f64c13fbbcade17 (diff)
downloadpoky-e29c4609c9c316cf8e37c2f3d977cc3fe23f2d27.tar.gz
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 <joshua.g.lock@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/populate_sdk_base.bbclass4
1 files 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"
26SDK_OUTPUT = "${SDK_DIR}/image" 26SDK_OUTPUT = "${SDK_DIR}/image"
27SDK_DEPLOY = "${DEPLOY_DIR}/sdk" 27SDK_DEPLOY = "${DEPLOY_DIR}/sdk"
28 28
29SDKDEPLOYDIR = "${WORKDIR}/deploy-${PN}-populate-sdk" 29SDKDEPLOYDIR = "${WORKDIR}/${SDKMACHINE}-deploy-${PN}-populate-sdk"
30 30
31B_task-populate-sdk = "${SDK_DIR}" 31B_task-populate-sdk = "${SDK_DIR}"
32 32
@@ -125,7 +125,7 @@ SSTATE_SKIP_CREATION_task-populate-sdk = '1'
125do_populate_sdk[cleandirs] = "${SDKDEPLOYDIR}" 125do_populate_sdk[cleandirs] = "${SDKDEPLOYDIR}"
126do_populate_sdk[sstate-inputdirs] = "${SDKDEPLOYDIR}" 126do_populate_sdk[sstate-inputdirs] = "${SDKDEPLOYDIR}"
127do_populate_sdk[sstate-outputdirs] = "${SDK_DEPLOY}" 127do_populate_sdk[sstate-outputdirs] = "${SDK_DEPLOY}"
128do_populate_sdk[stamp-extra-info] = "${MACHINE}" 128do_populate_sdk[stamp-extra-info] = "${MACHINE}${SDKMACHINE}"
129 129
130fakeroot create_sdk_files() { 130fakeroot create_sdk_files() {
131 cp ${COREBASE}/scripts/relocate_sdk.py ${SDK_OUTPUT}/${SDKPATH}/ 131 cp ${COREBASE}/scripts/relocate_sdk.py ${SDK_OUTPUT}/${SDKPATH}/