maas-images

Merge lp://staging/~newell-jensen/maas-images/dtb-files into lp://staging/maas-images

dtb-files
Merge into maas-ephemerals

Proposed by Newell Jensen on 2015-01-08

Status:

Merged

Merged at revision:

188

Proposed branch:

lp://staging/~newell-jensen/maas-images/dtb-files

Merge into:

lp://staging/maas-images

Diff against target:

336 lines (+107/-38)

5 files modified

bin/kpack-from-image (+44/-17)
bin/maas-cloudimg2eph2 (+26/-9)
conf/meph-v2.yaml (+3/-0)
meph2/commands/cloudimg_sync.py (+23/-6)
meph2/netinst.py (+11/-6)

To merge this branch:

bzr merge lp://staging/~newell-jensen/maas-images/dtb-files

Low

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Scott Moser (community)		2015-01-08	Needs Fixing on 2015-01-12
Review via email: mp+245915@code.staging.launchpad.net

Commit message

This branch adds scraping for Device Tree Blob (dtb) files, which are needed by sub-architecture xgene-uboot-mustang.

Revision history for this message

Scott Moser (smoser) wrote on 2015-01-12:

ok. so
a.) i put lp:~smoser/maas-images/dtb-files together, please pull from it.
there are some changes there that will need updating per my comment on how to call kpack-from-image (ie, i called it with an argument for dtb rather than a flag).

then, rather than determining if a dtb file is needed based on the presense of substring 'mustang', I'd like that to be declaritive somehow in conf/meph-v2.yaml . I think the way to do this is to have it in the 'data' dict of the kernel line (where 'kihelper' is).
ie:
{suffix: .xgene-mustang, kihelper: kh-xgene, di-format: 'xgene', 'dtb': true}

then copy the knowledge of needed dtb file through to kpack-from-image the way that '--kihelper' is carried through. so that we'd end up invoking
kpack-from-image --kihelper=foo --dtb=

this way future chnages just mean adding the appropriate change to the config file.

thats the suggestions so far, sorry but thats all i have time for right now.

review: Needs Fixing

Revision history for this message

Newell Jensen (newell-jensen) wrote on 2015-01-20:

Scott,

I just got around to testing your changes and seems they are broken.

Revision history for this message

Newell Jensen (newell-jensen) wrote on 2015-01-27:

Branch changed from "WIP" to "Needs Review". Ready for review now.

lp://staging/~newell-jensen/maas-images/dtb-files updated on 2015-01-27

180. By Newell Jensen on 2015-01-27: Merge with trunk.

Revision history for this message

Scott Moser (smoser) wrote on 2015-02-11:

Newell,

I just finished up (i hope) some changes that I've pushed to lp:~smoser/maas-images/dtb-files2 and have your changes integrated there.

One thing I just realized is that you've only enabled apm-mustang.dtb for trusty. We'd definitely want to have that for vivid also. Thats probably rue for the kh-xgene too.

We're close to getting this in.

Revision history for this message

Newell Jensen (newell-jensen) wrote on 2015-02-11:

Sounds good. Just let me know if there is anything else that needs to be
done.

On Wed, Feb 11, 2015 at 1:55 PM, Scott Moser <email address hidden> wrote:

> Newell,
>
> I just finished up (i hope) some changes that I've pushed to
> lp:~smoser/maas-images/dtb-files2 and have your changes integrated there.
>
> One thing I just realized is that you've only enabled apm-mustang.dtb for
> trusty. We'd definitely want to have that for vivid also. Thats probably
> rue for the kh-xgene too.
>
> We're close to getting this in.
>
> --
>
> https://code.launchpad.net/~newell-jensen/maas-images/dtb-files/+merge/245915
> You are the owner of lp:~newell-jensen/maas-images/dtb-files.
>