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

[Dimitri John Ledkov]

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.

[Dimitri John Ledkov (xnox)]

builds are good, uploaded livecd-rootfs.

[lp:~xnox/ubuntu-cdimage/add-unmatched]

1935. By Dimitri John Ledkov on 2021-03-12

Add unleashed+unmatched to qa-products

[Dimitri John Ledkov (xnox)]

livecd-rootfs has migrated this is good to go.

But will need additional entries in the ISO tracker.

[Steve Langasek (vorlon)]

Will both of these images also work in qemu?

review: Needs Information

[Dimitri John Ledkov (xnox)]

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.

[Steve Langasek (vorlon)]

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.

[lp:~xnox/ubuntu-cdimage/add-unmatched]

1936. By Dimitri John Ledkov on 2021-03-16

Add description strings

[Dimitri John Ledkov (xnox)]

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.

=== modified file 'etc/default-arches'
--- etc/default-arches	2021-02-10 16:01:19 +0000
+++ etc/default-arches	2021-03-16 01:42:48 +0000
@@ -57,7 +57,7 @@
 ubuntu-server		daily-preinstalled	eoan			armhf+raspi3 arm64+raspi3
 ubuntu-server		daily-preinstalled	focal			armhf+raspi arm64+raspi riscv64
 ubuntu-server		daily-preinstalled	groovy			armhf+raspi arm64+raspi
-ubuntu-server		daily-preinstalled	hirsute			armhf+raspi arm64+raspi riscv64
+ubuntu-server		daily-preinstalled	hirsute			armhf+raspi arm64+raspi riscv64+unleashed riscv64+unmatched
 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 'etc/qa-products'
--- etc/qa-products	2021-02-01 10:15:45 +0000
+++ etc/qa-products	2021-03-16 01:42:48 +0000
@@ -80,6 +80,8 @@
 Ubuntu Server arm64+raspi					ubuntu-server	daily-preinstalled		preinstalled-server			arm64+raspi		iso
 Ubuntu Server arm64+raspi3					ubuntu-server	daily-preinstalled		preinstalled-server			arm64+raspi3		iso
 Ubuntu Server riscv64						ubuntu-server	daily-preinstalled		preinstalled-server			riscv64			iso
+Ubuntu Server riscv64+unleashed					ubuntu-server	daily-preinstalled		preinstalled-server			riscv64+unleashed	iso
+Ubuntu Server riscv64+unmatched					ubuntu-server	daily-preinstalled		preinstalled-server			riscv64+unmatched	iso
 Ubuntu Server i386							ubuntu-server	daily				server					i386			iso
 Ubuntu Server powerpc						ubuntu-server	daily				server					powerpc			iso
 Ubuntu Server ppc64el						ubuntu-server	daily				server					ppc64el			iso

=== modified file 'lib/cdimage/livefs.py'
--- lib/cdimage/livefs.py	2021-02-16 11:23:00 +0000
+++ lib/cdimage/livefs.py	2021-03-16 01:42:48 +0000
@@ -78,14 +78,17 @@
         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"
+        # need to specify subarch to get raw.xz instead of qcow2
+        # originally, no subarch was the unleashed image. Add support
+        # for user-friendly subarch names and translate them to u-boot
+        # target names for livecd-rootfs maybe the two will be able to
+        # merge but at the moment, they are very different SOCs.
+        if subarch == "":
+            subarch = "hifive"  # for focal
+        elif subarch == "unleashed":
+            subarch = "sifive_fu540"
+        elif subarch == "unmatched":
+            subarch = "sifive_hifive_unmatched_fu740"
 
     return cpuarch, subarch
 

=== modified file 'lib/cdimage/tree.py'
--- lib/cdimage/tree.py	2021-02-03 10:33:30 +0000
+++ lib/cdimage/tree.py	2021-03-16 01:42:48 +0000
@@ -778,6 +778,8 @@
         "powerpc+ps3": "PlayStation 3",
         "ppc64el": "PowerPC64 Little-Endian",
         "riscv64": "RISC-V",
+        "riscv64+unleashed": "RISC-V for SiFive HiFive Unleashed",
+        "riscv64+unmatched": "RISC-V for SiFive HiFive Unmatched",
         "s390x": "IBM System z",
         "sparc": "SPARC",
     }
@@ -876,9 +878,12 @@
             sentences.append(
                 "For POWER8 Little-Endian computers, such as Power Systems "
                 "S8xxL/LC Linux-only servers.")
-        elif arch == "riscv64":
-            sentences.append(
-                "For RISC-V computers, such as SiFive HiFive Unleashed.")
+        elif arch in ("riscv64", "riscv64+unleashed"):
+            sentences.append(
+                "For RISC-V computers, with support for SiFive HiFive Unleashed and QEMU.")
+        elif arch in ("riscv64+unmatched"):
+            sentences.append(
+                "For RISC-V computers, with support for SiFive HiFive Unmatched and QEMU.")
         elif arch == "s390x":
             sentences.append(
                 "For IBM System z series mainframes, such as IBM LinuxONE.")