Merge lp://qastaging/~dooferlad/linaro-image-tools/fix-multiple-bootloaders into lp://qastaging/linaro-image-tools/11.11

Proposed by James Tunnicliffe
Status: Merged
Approved by: Milo Casagrande
Approved revision: 552
Merged at revision: 554
Proposed branch: lp://qastaging/~dooferlad/linaro-image-tools/fix-multiple-bootloaders
Merge into: lp://qastaging/linaro-image-tools/11.11
Diff against target: 405 lines (+161/-33)
6 files modified
linaro_image_tools/hwpack/builder.py (+7/-7)
linaro_image_tools/hwpack/config.py (+32/-10)
linaro_image_tools/hwpack/testing.py (+4/-6)
linaro_image_tools/hwpack/tests/test_config.py (+14/-9)
linaro_image_tools/hwpack/tests/test_config_v3.py (+17/-0)
linaro_image_tools/hwpack/tests/test_script.py (+87/-1)
To merge this branch: bzr merge lp://qastaging/~dooferlad/linaro-image-tools/fix-multiple-bootloaders
Reviewer Review Type Date Requested Status
Milo Casagrande (community) Approve
Paul Sokolovsky Approve
Review via email: mp+121880@code.qastaging.launchpad.net

Description of the change

Fixes building hardware packs from a configuration containing more than one bootloader.

To post a comment you must log in.
Revision history for this message
Paul Sokolovsky (pfalcon) wrote :

This looks good, thanks for taking care of this. There're bit more changes to testsuite than I immediately understand, but I assume they were needed to get this extended testing.

One note is that this will for sure conflict with changes my branch: I replaced function which had that remove_packages fiddling completely, and then re-implemented remove_packages a bit differently. Now seeing that you re-did it semantically differently, it needs to be propagated in my branch too.

review: Approve
Revision history for this message
Milo Casagrande (milo) wrote :

Hello James!

Thanks for fixing this!

On Wed, Aug 29, 2012 at 5:09 PM, James Tunnicliffe
<email address hidden> wrote:
> James Tunnicliffe has proposed merging lp:~dooferlad/linaro-image-tools/fix-multiple-bootloaders into lp:linaro-image-tools.
>
> - def __init__(self, fp, bootloader=None, board=None):
> + def __init__(self, fp, bootloader=None, board=None,
> + allow_unset_bootloader=False):
> """Create a Config.
>
> :param fp: a file-like object containing the configuration.
> """
> + self.allow_unset_bootloader = allow_unset_bootloader
> + self.bootloader = None

Maybe expand a little bit the docs here or add some comments, might no
be clear at first sight what allow_unset_bootloader is used for.
In case, do it when you merge.

> === modified file 'linaro_image_tools/hwpack/testing.py'
> --- linaro_image_tools/hwpack/testing.py 2012-06-13 14:53:32 +0000
> +++ linaro_image_tools/hwpack/testing.py 2012-08-29 15:08:19 +0000
> @@ -336,18 +336,18 @@
>
> def __init__(self, metadata, packages, sources,
> packages_without_content=None,
> - package_spec=None):
> + package_spec=None, format="1.0"):

Just one note here.
Should we start to default at least to 2.0? Even for testing...
We are going to drop support for 1.0 this month, don't know if it
would be a maintenance task though, but removing or at least dropping
for good support to 1.0 might be a separate task.

--
Milo Casagrande
Infrastructure Engineer
Linaro.org <www.linaro.org> │ Open source software for ARM SoCs

Revision history for this message
Milo Casagrande (milo) :
review: Approve
Revision history for this message
James Tunnicliffe (dooferlad) wrote :

Good point about commenting allow_unset_bootloader - definitely worth it. As for changing the default format to 2.0, I have had problems in the past when I tried to do a blanket change from 1.0 to 2.0. Taking out 1.0 support is a bit of an involved task.

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