summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-02 11:22:41 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-04 00:05:13 +0100
commitea3587e626a184c53dc0f484d1a0299b2b00641d (patch)
treeb2e981bfc07217b363cbd2df2cd586d316a07311
parent8361376b8ef0147276c9ee31349e904d86900593 (diff)
downloadopenembedded-core-contrib-ea3587e626a184c53dc0f484d1a0299b2b00641d.tar.gz
openembedded-core-contrib-ea3587e626a184c53dc0f484d1a0299b2b00641d.tar.bz2
openembedded-core-contrib-ea3587e626a184c53dc0f484d1a0299b2b00641d.zip
populate_sdk_ext: Put populate_sdk_ext under sstate control
Adding populate_sdk task to SSTATE_TASKS should make sstate machinery to generate manifest for deployed ext sdk artifacts and do final deployment to SDK_DEPLOY. This is done in a similar way to do_populate_sdk in a previous patch. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/populate_sdk_ext.bbclass11
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