Merge lp:~xnox/ubuntu-cdimage/riscv64+fu540 into lp:ubuntu-cdimage

[Dimitri John Ledkov]

default-arches: enable ubuntu-server daily-preinstalled riscv64+fu540

With livecd-rootfs 2.704 it should build correctly in hirsute.

[Steve Langasek (vorlon)]

why the choice of 'fu540' as a subarch name?

review: Needs Information

[Steve Langasek (vorlon)]

In particular, we want this image to also work on the Unmatched, which is a FU740 instead of FU540.

[Dimitri John Ledkov (xnox)]

Hi,

On Wed, 2 Dec 2020, 01:06 Steve Langasek, <email address hidden>
wrote:

> In particular, we want this image to also work on the Unmatched, which is
> a FU740 instead of FU540.
>

Currently this image has uboot-sifive which only has FU540 dtb built-in,
the one for Unleashed.

There are no publicly available dtb for Unmatched (FU740).

The code in livecd-rootfs currently is sensitive for subarch to be simply
specified, and doesn't care which one it is.

The name of the subarch is left for ubuntu-cdimage to pick.

It is not yet clear if uboot for loader2 partition can be built with two
dtbs, or if we will switch it to FU740.

I don't have the benefit of hindsight from the future thus any of thes
subarches would do: sifive hifive fu540.

Please pick one. The fu540 is the most strictly correct, SOC model. Hifive
is the product line of boards. Sifive is the vendor.

--
> https://code.launchpad.net/~xnox/ubuntu-cdimage/riscv64+fu540/+merge/394709
> You are the owner of lp:~xnox/ubuntu-cdimage/riscv64+fu540.
>

[Steve Langasek (vorlon)]

I would say 'hifive', then, since we fully intend this to be bootable across multiple boards/chips.

Also, didn't we determine that it's possible to make an image bootable both on the hifive boards and under qemu / with UEFI/EBBR? In that case, even if the work is not yet done to make it boot under UEFI, I would prefer that we use no subarch for the image name.

[lp:~xnox/ubuntu-cdimage/riscv64+fu540]

1916. By Steve Langasek on 2020-12-02

Merge lp:~xnox/ubuntu-cdimage/open-uc22

1917. By Łukasz Zemczak on 2020-12-02

Add support for UC22 in core_series()

1918. By Dimitri John Ledkov on 2020-12-03

riscv64: enable server-preinstalled image

Build livefs in launchpad with a subarch, but publish without it. Thus
published image name is hirsute-preinstalled-server-riscv64.img.xz and
similar.

This is inverse of the old amd64+mac image, which was built without
subarch but published with one.

[Dimitri John Ledkov (xnox)]

@vorlon

Sounds good. Implemented the correct livefs build, yet publishing without subarch.

=== modified file 'etc/default-arches'
--- etc/default-arches	2020-11-09 11:33:14 +0000
+++ etc/default-arches	2020-12-03 21:40:36 +0000
@@ -54,7 +54,8 @@
 ubuntu-server		daily-preinstalled	bionic			armhf+raspi3 arm64+raspi3
 ubuntu-server		daily-preinstalled	cosmic-disco			armhf+raspi2 armhf+raspi3 arm64+raspi3
 ubuntu-server		daily-preinstalled	eoan			armhf+raspi3 arm64+raspi3
-ubuntu-server		daily-preinstalled	focal-			armhf+raspi arm64+raspi
+ubuntu-server		daily-preinstalled	focal-groovy			armhf+raspi arm64+raspi
+ubuntu-server		daily-preinstalled	hirsute			armhf+raspi arm64+raspi riscv64
 ubuntu-server		*			precise			amd64 i386
 ubuntu-server		*			trusty			amd64 amd64+mac i386 powerpc ppc64el
 ubuntu-server		*			xenial			amd64 arm64 i386 powerpc ppc64el s390x

=== modified file 'lib/cdimage/livefs.py'
--- lib/cdimage/livefs.py	2020-10-08 13:43:11 +0000
+++ lib/cdimage/livefs.py	2020-12-03 21:40:36 +0000
@@ -77,6 +77,15 @@
         # Use normal amd64 live image on amd64+mac.
         subarch = ""
 
+    if cpuarch == "riscv64":
+        # ubuntu-cpc project needs to know that disk1.img.xz is needed
+        # instead of qcow2; and that it should add uboot for hifive
+        # boards, thus specify subarch for livefs build. However, we
+        # don't want +subarch in the published image names. Hence
+        # default-arches does not specify anything.
+        # TODO add support to specify the above via image_format metadata_override.
+        subarch = "hifive"
+
     return cpuarch, subarch
 
 
@@ -526,6 +535,8 @@
         return ["generic"]
     elif cpuarch == "sparc":
         return ["sparc64"]
+    elif cpuarch == "riscv64":
+        return ["generic"]
     else:
         raise UnknownArchitecture(
             "No live filesystem source known for %s" % arch)