summaryrefslogtreecommitdiffstats
path: root/meta/classes/image.bbclass
diff options
context:
space:
mode:
authorChristopher Larson <kergoth@gmail.com>2021-03-25 21:16:59 +0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-04-06 22:45:36 +0100
commit251639560dd29bd2da5e694c1d5958ca26b12d0d (patch)
tree9040251990cbe1f712b3fd2a6dc6463337c5be92 /meta/classes/image.bbclass
parent800905ff41b8e7ba7bf89caa989f1ff7d6654705 (diff)
downloadpoky-251639560dd29bd2da5e694c1d5958ca26b12d0d.tar.gz
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] (From OE-Core rev: d044d9c0cb672c499059eb273e399ce4aee17e0d) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit edc28907ce19a7298059dd388933c58a9c6c28b9) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/image.bbclass')
-rw-r--r--meta/classes/image.bbclass2
1 files changed, 1 insertions, 1 deletions
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):
115 'IMAGE_PREPROCESS_COMMAND','RPM_PREPROCESS_COMMANDS','RPM_POSTPROCESS_COMMANDS','DEB_PREPROCESS_COMMANDS','DEB_POSTPROCESS_COMMANDS'] 115 'IMAGE_PREPROCESS_COMMAND','RPM_PREPROCESS_COMMANDS','RPM_POSTPROCESS_COMMANDS','DEB_PREPROCESS_COMMANDS','DEB_POSTPROCESS_COMMANDS']
116 116
117python () { 117python () {
118 variables = rootfs_command_variables(d) + sdk_command_variables(d) 118 variables = rootfs_command_variables(d)
119 for var in variables: 119 for var in variables:
120 if d.getVar(var, False): 120 if d.getVar(var, False):
121 d.setVarFlag(var, 'func', '1') 121 d.setVarFlag(var, 'func', '1')