Merge lp://qastaging/~milo/linaro-image-tools/default-bootloader into lp://qastaging/linaro-image-tools/11.11

Proposed by Milo Casagrande
Status: Merged
Approved by: James Tunnicliffe
Approved revision: 570
Merged at revision: 570
Proposed branch: lp://qastaging/~milo/linaro-image-tools/default-bootloader
Merge into: lp://qastaging/linaro-image-tools/11.11
Diff against target: 158 lines (+46/-24)
2 files modified
linaro_image_tools/hwpack/config.py (+26/-6)
linaro_image_tools/media_create/boards.py (+20/-18)
To merge this branch: bzr merge lp://qastaging/~milo/linaro-image-tools/default-bootloader
Reviewer Review Type Date Requested Status
James Tunnicliffe (community) Approve
Paul Sokolovsky Pending
Linaro Infrastructure Pending
Review via email: mp+127500@code.qastaging.launchpad.net

Description of the change

This branch sets the default bootloader in a slightly different way than it was done before.
There is a small change in how two methods are called, and how a Config object is created.

In the code, we are using the Config object to create the real config when running linaro-hwpack-create (to create an hwpack) and also when running linaro-media-create (we are using the Config class to read the metadata file treating it as a Config object).

To maintain a little bit of compatibility with what was done before, now the Config object will call the set_board and set_bootloader methods only when the two parameters passed to the constuctor are defined (not None). Since when we are creating the hwpack with linaro-hwpack-create we are not interested in which bootloaders are present, but just if they are valid, we do not need to go through the setting of boards and bootloaders at that time. When we use linaro-media-create instead, we explicitly call set_board and set_bootloader, after validating the Config, in order to set the correct values.

To post a comment you must log in.
570. By Milo Casagrande

Removed unnecessary comment.

Revision history for this message
James Tunnicliffe (dooferlad) wrote :

Looks great. Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches