Merge lp://staging/~xnox/ubuntu-cdimage/add-unmatched into lp://staging/ubuntu-cdimage

Proposed by Dimitri John Ledkov
Status: Merged
Merged at revision: 1937
Proposed branch: lp://staging/~xnox/ubuntu-cdimage/add-unmatched
Merge into: lp://staging/ubuntu-cdimage
Diff against target: 84 lines (+22/-12)
4 files modified
etc/default-arches (+1/-1)
etc/qa-products (+2/-0)
lib/cdimage/livefs.py (+11/-8)
lib/cdimage/tree.py (+8/-3)
To merge this branch: bzr merge lp://staging/~xnox/ubuntu-cdimage/add-unmatched
Reviewer Review Type Date Requested Status
Steve Langasek Needs Information
Review via email: mp+399498@code.staging.launchpad.net

Commit message

Switch riscv64 image to become two images "unleashed" and "unmatched".

Currently the two SOCs are very different, and cannot be made bootable out of single u-boot builds.

Testing these changes in:
https://launchpad.net/~xnox/+livefs/ubuntu/hirsute/any

So this is draft at the moment.

To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

builds are good, uploaded livecd-rootfs.

1935. By Dimitri John Ledkov

Add unleashed+unmatched to qa-products

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

livecd-rootfs has migrated this is good to go.

But will need additional entries in the ISO tracker.

Revision history for this message
Steve Langasek (vorlon) wrote :

Will both of these images also work in qemu?

review: Needs Information
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

yes, both images work in qemu.

Because qemu uses u-boot from the host, thus it only read the rootfs partition from the image. It does not care about loader1/loader2 partitions which are used by the sifive boards.

Revision history for this message
Steve Langasek (vorlon) wrote :

If both work in qemu, should we be concerned about there being an obvious default? It doesn't appear the two images are guaranteed to be in sync with respect to the archive so this could cause some confusion and support issues.

1936. By Dimitri John Ledkov

Add description strings

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

To be fair, I wish it was a single livefs build that spits out both builds, as the difference between them is really which dir of u-boot-sifive is used to dd contents of loader1/loader2, which is unused by qemu.

The two images are equivalent from QEMU point of view, as it doesn't use loader1/loader2 partitions, and the rootfs should be the same, or `apt update; apt full-upgrade` will make it the same.

I also kind of wish to package & spit out the SPI flash firmware images too, such that users can upgrade SPI flash firmware to Ubuntu.

Cause ideally the single build will produce 4 artefacts to publish on cdimage.ubuntu.com: .img.xz + spi.img.xz for both unleashed and unmatched.

But this should do for now.

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