From 8361376b8ef0147276c9ee31349e904d86900593 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Thu, 1 Sep 2016 11:56:02 +0300 Subject: populate_sdk_base: Put populate_sdk under sstate control Adding populate_sdk task to SSTATE_TASKS should make sstate machinery to generate manifest for deployed sdk artifacts and do final deployment to SDK_DEPLOY. Set stamp-extra-info flag for do_populate_sdk task. This flag is used in the name of sstate manifest. Setting it to predetermined value for populate_sdk task should help to get correct manifest filenames when processing runQueueTask events. The do_populate_sdk function is also executed by do_populate_sdk_ext so in order to avoid conflicts with the sstate postfuncs, split the main code into a separate function. We also need to set SDKDEPLOYDIR as do_populate_sdk_ext expects it in order not to break ESDK generation. Signed-off-by: Ed Bartosh Signed-off-by: Richard Purdie --- meta/classes/populate_sdk_ext.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/classes/populate_sdk_ext.bbclass') diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index b52ad41d3d..906ae749fc 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -599,8 +599,9 @@ 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') - bb.build.exec_func("do_populate_sdk", d) + populate_sdk_common(d) } def get_ext_sdk_depends(d): -- cgit v1.2.3