diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2016-02-17 13:21:22 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-18 07:39:30 +0000 |
commit | eb6d14e64c545523cda9f44ca1a2147a7ad9be5b (patch) | |
tree | aa73aba9d2dcdcbd41916ea1ad570989721dd2e3 /meta/classes/populate_sdk_base.bbclass | |
parent | c9e5e347f74767ef66d9a477e648b39ff5d66247 (diff) | |
download | poky-eb6d14e64c545523cda9f44ca1a2147a7ad9be5b.tar.gz |
image/populate_sdk: seprate variables to fix dependency
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]
(From OE-Core rev: 590cf4be70f1355622d3a94d76b4cc6d525d4a34)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/populate_sdk_base.bbclass')
-rw-r--r-- | meta/classes/populate_sdk_base.bbclass | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index cc211ab430..de23f141f9 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass | |||
@@ -243,6 +243,19 @@ populate_sdk_log_check() { | |||
243 | done | 243 | done |
244 | } | 244 | } |
245 | 245 | ||
246 | def sdk_command_variables(d): | ||
247 | return ['OPKG_PREPROCESS_COMMANDS','OPKG_POSTPROCESS_COMMANDS','POPULATE_SDK_POST_HOST_COMMAND','POPULATE_SDK_POST_TARGET_COMMAND','SDK_POSTPROCESS_COMMAND','RPM_PREPROCESS_COMMANDS', | ||
248 | 'RPM_POSTPROCESS_COMMANDS'] | ||
249 | |||
250 | def sdk_variables(d): | ||
251 | variables = ['BUILD_IMAGES_FROM_FEEDS','SDK_OS','SDK_OUTPUT','SDKPATHNATIVE','SDKTARGETSYSROOT','SDK_DIR','SDK_VENDOR','SDKIMAGE_INSTALL_COMPLEMENTARY','SDK_PACKAGE_ARCHS','SDK_OUTPUT', | ||
252 | 'SDKTARGETSYSROOT','MULTILIB_VARIANTS','MULTILIBS','ALL_MULTILIB_PACKAGE_ARCHS','MULTILIB_GLOBAL_VARIANTS','BAD_RECOMMENDATIONS','NO_RECOMMENDATIONS','PACKAGE_ARCHS', | ||
253 | 'PACKAGE_CLASSES','TARGET_VENDOR','TARGET_VENDOR','TARGET_ARCH','TARGET_OS','BBEXTENDVARIANT','FEED_DEPLOYDIR_BASE_URI'] | ||
254 | variables.extend(sdk_command_variables(d)) | ||
255 | return " ".join(variables) | ||
256 | |||
257 | do_populate_sdk[vardeps] += "${@sdk_variables(d)}" | ||
258 | |||
246 | do_populate_sdk[file-checksums] += "${COREBASE}/meta/files/toolchain-shar-relocate.sh:True \ | 259 | do_populate_sdk[file-checksums] += "${COREBASE}/meta/files/toolchain-shar-relocate.sh:True \ |
247 | ${COREBASE}/meta/files/toolchain-shar-extract.sh:True" | 260 | ${COREBASE}/meta/files/toolchain-shar-extract.sh:True" |
248 | 261 | ||