Merge ~waveform/ubuntu-images:mantic into ubuntu-images:mantic

[Dave Jones]

[Dimitri John Ledkov (xnox)]

build fails on gadget build, on line 254 of Mafile with
"recipe commences before first target.

It seems like https://github.com/snapcore/pi-gadget/commit/5d45b91b8fddee7c98df52754b15ce2ebc5274e8#r128100528 there is missing '\' on the multiline setting.

review: Needs Fixing

[Dimitri John Ledkov (xnox)]

The pi-gadget got updated, and I managed to build correct images for both armhf and arm64 server. The destkop one is good as well but requires a further fix up proposed at https://code.launchpad.net/~xnox/ubuntu-images/+git/ubuntu-images/+merge/451941

[Dimitri John Ledkov (xnox)]

review: Approve (test-build)

[Steve Langasek (vorlon)]

The biggest effective change here is:

$ git diff origin/classic{,-redesign} | diffstat | tail -n1
 37 files changed, 642 insertions(+), 461 deletions(-)
$

So rather than being just a fix of the branch name, this seems to introduce quite a few functional changes vs the branch we're currently using for building! It would have been nice to have harmonized those two branches so that we could just make the branch name switch separately from any behavioral changes, especially now that we're well past feature freeze.

We know that the Pi images are going to get a lot of testing shortly so if there are any problems we can iterate. But it's still a risky approach.

review: Approve

diff --git a/ubuntu-pi-arm64.yaml b/ubuntu-pi-arm64.yaml
index 0da4798..8bf665d 100644
--- a/ubuntu-pi-arm64.yaml
+++ b/ubuntu-pi-arm64.yaml
@@ -7,7 +7,7 @@ class: preinstalled
 kernel: linux-image-raspi
 gadget:
   url: "https://git.launchpad.net/snap-pi"
-  branch: "classic-redesign"
+  branch: "classic"
   type: "git"
   target: "desktop"
 rootfs:
@@ -15,6 +15,8 @@ rootfs:
   components:
     - main
     - restricted
+    - universe
+    - multiverse
   mirror: "http://ports.ubuntu.com/ubuntu-ports/"
   pocket: updates
   seed:
@@ -31,24 +33,17 @@ rootfs:
       - supported-raspi-common
 customization:
   extra-snaps:
-    -
-      name: snapd
-    -
-      name: bare
-    - 
-      name: gnome-42-2204
+    - name: snapd
+    - name: bare
+    - name: gnome-42-2204
       channel: stable/ubuntu-23.10
-    - 
-      name: gtk-common-themes
+    - name: gtk-common-themes
       channel: stable/ubuntu-23.10
-    - 
-      name: firefox
+    - name: firefox
       channel: stable/ubuntu-23.10
-    - 
-      name: snap-store
+    - name: snap-store
       channel: stable/ubuntu-23.10
-    - 
-      name: snapd-desktop-integration
+    - name: snapd-desktop-integration
       channel: stable/ubuntu-23.10
   extra-packages:
     - name: oem-config
@@ -57,15 +52,13 @@ customization:
     - name: oem-config-slideshow-ubuntu
     - name: ubiquity-slideshow-ubuntu
   fstab:
-    -
-      label: "writable"
+    - label: "writable"
       mountpoint: "/"
       filesystem-type: "ext4"
       mount-options: "discard"
       dump: false
       fsck-order: 1
-    -
-      label: "system-boot"
+    - label: "system-boot"
       mountpoint: "/boot/firmware"
       filesystem-type: "vfat"
       mount-options: "defaults"
@@ -81,7 +74,6 @@ customization:
       - path: "/usr/sbin/oem-config-prepare"
 artifacts:
   img:
-    -
-      name: ubuntu-23.10-preinstalled-desktop-arm64+raspi.img
+    - name: ubuntu-23.10-preinstalled-desktop-arm64+raspi.img
   manifest:
     name: ubuntu-23.10-preinstalled-desktop-arm64+raspi.manifest
diff --git a/ubuntu-server-pi-arm64.yaml b/ubuntu-server-pi-arm64.yaml
index 4530056..1634376 100644
--- a/ubuntu-server-pi-arm64.yaml
+++ b/ubuntu-server-pi-arm64.yaml
@@ -7,13 +7,15 @@ class: preinstalled
 kernel: linux-image-raspi
 gadget:
   url: "https://git.launchpad.net/snap-pi"
-  branch: "classic-redesign"
+  branch: "classic"
   type: "git"
 rootfs:
   archive: ubuntu
   components:
     - main
     - restricted
+    - universe
+    - multiverse
   mirror: "http://ports.ubuntu.com/ubuntu-ports/"
   pocket: updates
   seed:
@@ -32,14 +34,12 @@ customization:
   extra-snaps:
     - name: snapd
   fstab:
-    -
-      label: "writable"
+    - label: "writable"
       mountpoint: "/"
       filesystem-type: "ext4"
       dump: false
       fsck-order: 1
-    -
-      label: "system-boot"
+    - label: "system-boot"
       mountpoint: "/boot/firmware"
       filesystem-type: "vfat"
       mount-options: "defaults"
@@ -47,7 +47,6 @@ customization:
       fsck-order: 1
 artifacts:
   img:
-    -
-      name: ubuntu-23.10-preinstalled-server-arm64+raspi.img
+    - name: ubuntu-23.10-preinstalled-server-arm64+raspi.img
   manifest:
     name: ubuntu-23.10-preinstalled-server-arm64+raspi.manifest
diff --git a/ubuntu-server-pi.yaml b/ubuntu-server-pi.yaml
index 81fd593..083a106 100644
--- a/ubuntu-server-pi.yaml
+++ b/ubuntu-server-pi.yaml
@@ -7,13 +7,15 @@ class: preinstalled
 kernel: linux-image-raspi
 gadget:
   url: "https://git.launchpad.net/snap-pi"
-  branch: "classic-redesign"
+  branch: "classic"
   type: "git"
 rootfs:
   archive: ubuntu
   components:
     - main
     - restricted
+    - universe
+    - multiverse
   mirror: "http://ports.ubuntu.com/ubuntu-ports/"
   pocket: updates
   seed:
@@ -32,14 +34,12 @@ customization:
   extra-snaps:
     - name: snapd
   fstab:
-    -
-      label: "writable"
+    - label: "writable"
       mountpoint: "/"
       filesystem-type: "ext4"
       dump: false
       fsck-order: 1
-    -
-      label: "system-boot"
+    - label: "system-boot"
       mountpoint: "/boot/firmware"
       filesystem-type: "vfat"
       mount-options: "defaults"
@@ -47,7 +47,6 @@ customization:
       fsck-order: 1
 artifacts:
   img:
-    -
-      name: ubuntu-23.10-preinstalled-server-armhf+raspi.img
+    - name: ubuntu-23.10-preinstalled-server-armhf+raspi.img
   manifest:
     name: ubuntu-23.10-preinstalled-server-armhf+raspi.manifest