maas-images

Merge lp://staging/~ltrager/maas-images/lp1702976 into lp://staging/maas-images

lp1702976
Merge into maas-ephemerals

Proposed by Lee Trager on 2017-07-12

Status:

Merged

Merged at revision:

374

Proposed branch:

lp://staging/~ltrager/maas-images/lp1702976

Merge into:

lp://staging/maas-images

Diff against target:

14 lines (+4/-0)

1 file modified

bin/kpack-from-image (+4/-0)

To merge this branch:

bzr merge lp://staging/~ltrager/maas-images/lp1702976

Undecided

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Andres Rodriguez (community)		2017-07-12	Approve on 2017-07-12
Review via email: mp+327329@code.staging.launchpad.net

Commit message

Include the i2c-thunderx driver on ARM64 only.

Enlistment fails on Cavium ThunderX systems as the IPMI SSIF interface requires the i2c-thunderx module to access the BMC. Include the i2c-thunderx driver in the published ARM64 initrds.

Revision history for this message

Andres Rodriguez (andreserl) wrote on 2017-07-12:

Lgtm! Have you tested this? Also, please superseed the other MP!

review: Approve

Revision history for this message

dann frazier (dannf) wrote on 2017-07-12:

My comments from my original merge proposal still stand here:
https://code.launchpad.net/~dannf/maas-images/lp1702976/+merge/327308

Specifically, I'd prefer we do this for arm*, just just for arm64, and that we include all the bus drivers, not just the i2c-thunderx driver. I don't know of any specific system that would be fixed by either of the above - but seems like a cleaner future-proofing. And obviously, it's ultimately your call.

I'd also like to continue to ask that we use 'dpkg --print-architecture' instead of 'uname -m'. From chatting on IRC, it sounds like qemu-user does emulate 'uname -m' to match the userspace, but that's just one form of a non-native build mechanism. Consider if we were building images for armhf on an arm64 host in an lxd container:

root@armhf:~# uname -m
armv8l

Whereas, we know in this case 'dpkg --print-architecture' will always report the thing we want to know:
root@armhf:~# dpkg --print-architecture
armhf