classes/bundle: depend on do_deploy task for kernel and bootloader #19
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mnhu
reviewed
Sep 19, 2017
classes/bundle.bbclass
Outdated
| do_fetch[depends] = "${@' '.join([d.getVar(image, True) + ":do_image_complete" for image in \ | ||
| ['RAUC_SLOT_' + slot for slot in d.getVar('RAUC_BUNDLE_SLOTS', True).split()]])}" | ||
| python __anonymous() { | ||
| for slot in d.getVar('RAUC_BUNDLE_SLOTS', True).split(): |
There was a problem hiding this comment.
No need to pass True to d.getVar(), as this is the default since November 16.
There was a problem hiding this comment.
It's to be consistent with the rest of the code ;) But we should re-change this in the entire code to match again current default.
classes/bundle.bbclass
Outdated
| slotflags = d.getVarFlags('RAUC_SLOT_%s' % slot) | ||
| imgtype = slotflags.get('type') if slotflags else None | ||
| if imgtype == 'kernel' or imgtype == 'boot': | ||
| d.appendVarFlag('do_fetch', 'depends', ' ' + d.getVar('RAUC_SLOT_%s' % slot, True) + ':do_deploy') |
classes/bundle.bbclass
Outdated
| if imgtype == 'kernel' or imgtype == 'boot': | ||
| d.appendVarFlag('do_fetch', 'depends', ' ' + d.getVar('RAUC_SLOT_%s' % slot, True) + ':do_deploy') | ||
| else: | ||
| d.appendVarFlag('do_fetch', 'depends', ' ' + d.getVar('RAUC_SLOT_%s' % slot, True) + ':do_image_complete') |
mnhu
reviewed
Sep 19, 2017
classes/bundle.bbclass
Outdated
| slotflags = d.getVarFlags('RAUC_SLOT_%s' % slot) | ||
| imgtype = slotflags.get('type') if slotflags else None | ||
| if imgtype == 'kernel' or imgtype == 'boot': | ||
| d.appendVarFlag('do_fetch', 'depends', ' ' + d.getVar('RAUC_SLOT_%s' % slot, True) + ':do_deploy') |
There was a problem hiding this comment.
Wouldn't it be a tiny bit nicer to use an intermediate image variable instead of duplicating d.getVar('RAUC_SLOT_%s' % slot, True) ?
There was a problem hiding this comment.
Yes, might be a little nicer.
This was referenced Oct 4, 2017
Closed
As getVar() now defaults to expanding by default, remove the True option from getVar() and getVarFlag() calls. Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
Depending on `do_image_complete` task is valid for images but inappropriate for kernel and bootloader which do not have such a task. This changes the dependency auto-generation in order to honor the image `type` varflag provided and depend on the `do_deploy` task for kernel and bootloader. Signed-off-by: Enrico Jorns <ejo@pengutronix.de>
ejoerns
force-pushed
the
topic/bundle-dependency-fix
branch
from
5c203e3
to
3b47a59
Compare
|
I've added a patch to finally remove the True option to getVar() calls and based the dependency fix patch on it. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Depending on
do_image_completetask is valid for images butinappropriate for kernel and bootloader which do not have such a task.
This changes the dependency auto-generation in order to honor the image
typevarflag provided and depend on thedo_deploytask for kerneland bootloader.
This fixes #14