Ubuntu system image

Merge lp://qastaging/~sil2100/ubuntu-system-image/server_special-case_core_archs into lp://qastaging/ubuntu-system-image/server

server_special-case_core_archs
Merge into server

Proposed by Łukasz Zemczak on 2015-11-12

Status:	Merged
Approved by:	Łukasz Zemczak on 2015-11-12
Approved revision:	281
Merged at revision:	280
Proposed branch:	lp://qastaging/~sil2100/ubuntu-system-image/server_special-case_core_archs
Merge into:	lp://qastaging/ubuntu-system-image/server
Diff against target:	34 lines (+8/-2) 2 files modified lib/systemimage/generators.py (+5/-1) lib/systemimage/tests/test_generators.py (+3/-1)
To merge this branch:	bzr merge lp://qastaging/~sil2100/ubuntu-system-image/server_special-case_core_archs
Related bugs:	Link a bug report

Reviewer	Date Requested	Status
Barry Warsaw (community)	2015-11-12	Approve on 2015-11-12
Oliver Grawert (community)		Approve on 2015-11-12
Review via email: mp+277341@code.qastaging.launchpad.net

Commit message

Change the special case architecture handling of plano to an arch of amd64.plano. Add a similar special case for the raspi2_armhf device, pulling in the armhf.raspi2 arch tarballs.

Description of the change

Change the special case architecture handling of plano to an arch of amd64.plano. Add a similar special case for the raspi2_armhf device, pulling in the armhf.raspi2 arch tarballs.

The end idea would be to simply introduce a subarch parameter to the generator that should be fairly easy to do, but as a quick fix we can hard-code it for now as we did with the rest.

Revision history for this message

Oliver Grawert (ogra) wrote on 2015-11-12:

looks good (and it is rather urgent for todays stable release)

review: Approve

Revision history for this message

Oliver Grawert (ogra) wrote on 2015-11-12:

hmm, line 9 should probably read:

elif environment['device_name'] == "generic_amd64":

since you only have a list of 1 item now

Revision history for this message

Łukasz Zemczak (sil2100) wrote on 2015-11-12:

Yes, but I left it as it was before. Before Steve's plano change it was elif environment['device_name'] in ("generic_amd64",):, so I didn't feel like changing existing semantics ;)