From: Christopher Larson Date: Thu, 25 Mar 2021 16:16:59 +0000 (+0500) Subject: image,populate_sdk_base: move 'func' flag setting for sdk command vars X-Git-Tag: 2020-04.7-dunfell~1 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=d044d9c0cb672c499059eb273e399ce4aee17e0d;p=openembedded-core.git image,populate_sdk_base: move 'func' flag setting for sdk command vars Setting the 'func' flag on the commands variables ensures that they are parsed as shell, and therefore that the referenced commands contents are included in checksums. Doing this only in image.bbclass means that this is missing in recipes that are not images, but which inherit populate_sdk or populate_sdk_base directly, so move it to the latter. [YOCTO #13998] Signed-off-by: Christopher Larson Signed-off-by: Richard Purdie (cherry picked from commit edc28907ce19a7298059dd388933c58a9c6c28b9) Signed-off-by: Steve Sakoman --- diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 42d2886505..79c487ea18 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -115,7 +115,7 @@ def rootfs_command_variables(d): 'IMAGE_PREPROCESS_COMMAND','RPM_PREPROCESS_COMMANDS','RPM_POSTPROCESS_COMMANDS','DEB_PREPROCESS_COMMANDS','DEB_POSTPROCESS_COMMANDS'] python () { - variables = rootfs_command_variables(d) + sdk_command_variables(d) + variables = rootfs_command_variables(d) for var in variables: if d.getVar(var, False): d.setVarFlag(var, 'func', '1') diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass index 6954237596..ca56d803cb 100644 --- a/meta/classes/populate_sdk_base.bbclass +++ b/meta/classes/populate_sdk_base.bbclass @@ -324,6 +324,13 @@ def sdk_variables(d): do_populate_sdk[vardeps] += "${@sdk_variables(d)}" +python () { + variables = sdk_command_variables(d) + for var in variables: + if d.getVar(var, False): + d.setVarFlag(var, 'func', '1') +} + do_populate_sdk[file-checksums] += "${TOOLCHAIN_SHAR_REL_TMPL}:True \ ${TOOLCHAIN_SHAR_EXT_TMPL}:True"