1 files changed, 10 insertions, 1 deletions

diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 906ae749fc..d8d123a0e5 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -599,7 +599,7 @@ fakeroot python do_populate_sdk_ext() {
     buildtools_fn = get_current_buildtools(d)
     d.setVar('SDK_REQUIRED_UTILITIES', get_sdk_required_utilities(buildtools_fn, d))
     d.setVar('SDK_BUILDTOOLS_INSTALLER', buildtools_fn)
-    d.setVar('SDKDEPLOYDIR', '${DEPLOY_DIR}/sdk')
+    d.setVar('SDKDEPLOYDIR', '${SDKEXTDEPLOYDIR}')
 
     populate_sdk_common(d)
 }
@@ -653,4 +653,13 @@ do_populate_sdk_ext[vardeps] += "copy_buildsystem \
 # always runs.
 do_populate_sdk_ext[nostamp] = "1"
 
+SDKEXTDEPLOYDIR = "${WORKDIR}/deploy-${PN}-populate-sdk-ext"
+
+SSTATETASKS += "do_populate_sdk_ext"
+SSTATE_SKIP_CREATION_task-populate-sdk-ext = '1'
+do_populate_sdk_ext[cleandirs] = "${SDKDEPLOYDIR}"
+do_populate_sdk_ext[sstate-inputdirs] = "${SDKEXTDEPLOYDIR}"
+do_populate_sdk_ext[sstate-outputdirs] = "${SDK_DEPLOY}"
+do_populate_sdk_ext[stamp-extra-info] = "${MACHINE}"
+
 addtask populate_sdk_ext after do_sdk_depends