diff options
| author |   Chen Qi <Qi.Chen@windriver.com> | 2016-01-05 15:26:30 +0800 |
|---|---|---|
| committer | Chen Qi <Qi.Chen@windriver.com> | 2016-01-05 15:51:19 +0800 |
| commit | f51479ec00250de627c5a29851cc971b58efc080 (patch) | |
| tree | 5e6bbd6f4f48f50db8aafa2b30804d85aa21c83f /meta/classes/populate_sdk_base.bbclass | |
| parent | 80b3974081c4a8c604e23982a6db8fb32c616058 (diff) | |
| download | openembedded-core-contrib-f51479ec00250de627c5a29851cc971b58efc080.tar.gz | |
image/populate_sdk: seprate variables to fix dependencyChenQi/bug8670
Previously, do_rootfs depends on variables like SDK_OS, SDK_OUTPUT, etc.
And changing variables like POPULATE_SDK_POST_HOST_COMMAND doesn't cause
do_populate_sdk to rerun.
This patch separates variables so that do_rootfs and do_populate_sdk could
correctly depend on their related variables.
[YOCTO #8670]
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Diffstat (limited to 'meta/classes/populate_sdk_base.bbclass')
| -rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index 35e129b068..e225f9c947 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -188,6 +188,20 @@ populate_sdk_log_check() { done } + +def sdk_command_variables(d): + return ['OPKG_PREPROCESS_COMMANDS','OPKG_POSTPROCESS_COMMANDS','POPULATE_SDK_POST_HOST_COMMAND','POPULATE_SDK_POST_TARGET_COMMAND','SDK_POSTPROCESS_COMMAND','RPM_PREPROCESS_COMMANDS', + 'RPM_POSTPROCESS_COMMANDS'] + +def sdk_variables(d): + variables = ['BUILD_IMAGES_FROM_FEEDS','SDK_OS','SDK_OUTPUT','SDKPATHNATIVE','SDKTARGETSYSROOT','SDK_DIR','SDK_VENDOR','SDKIMAGE_INSTALL_COMPLEMENTARY','SDK_PACKAGE_ARCHS','SDK_OUTPUT', + 'SDKTARGETSYSROOT','MULTILIB_VARIANTS','MULTILIBS','ALL_MULTILIB_PACKAGE_ARCHS','MULTILIB_GLOBAL_VARIANTS','BAD_RECOMMENDATIONS','NO_RECOMMENDATIONS','PACKAGE_ARCHS', + 'PACKAGE_CLASSES','TARGET_VENDOR','TARGET_VENDOR','TARGET_ARCH','TARGET_OS','BBEXTENDVARIANT','FEED_DEPLOYDIR_BASE_URI'] + variables.extend(sdk_command_variables(d)) + return " ".join(variables) + +do_populate_sdk[vardeps] += "${@sdk_variables(d)}" + do_populate_sdk[dirs] = "${PKGDATA_DIR} ${TOPDIR}" do_populate_sdk[depends] += "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_DEPENDS', True).split()])} ${@d.getVarFlag('do_rootfs', 'depends', False)}" do_populate_sdk[rdepends] = "${@' '.join([x + ':do_populate_sysroot' for x in d.getVar('SDK_RDEPENDS', True).split()])}" |