Merge ~edubuntu-dev/ubuntu-images:noble into ubuntu-images:noble

[Erich Eickmeyer]

Add Edubuntu Raspberry Pi image .yaml

This should be the first step to add the Edubuntu raspberry pi image. There's still a few bugs to fix. For instance, ubuntu-image seems to be not adding the Edubuntu-specific seeds (ubuntu-edu-*) despite it working properly in mantic and everything being found by germinate during the process.

[Steve Langasek (vorlon)]

review: Needs Fixing

[Erich Eickmeyer (eeickmeyer)]

Comments inline. This was tested successfully and admittedly still has some bugs to iron out prior to starting image builds. The testing environment was on a Rapberry Pi with a clean install of Ubuntu Server 23.10. This was done according to instructions used per Lukasz.

[Steve Langasek (vorlon)]

Requesting additional reviews from Dave (who has experience configuring the yaml for the Ubuntu pi images) and Paul (who maintains ubuntu-image) so we can figure out what's going on here. I don't want us to just be adding this config as-is and encoding workarounds for ubuntu-image bugs that we don't have reported anywhere. (If these things have to be hard-coded for Edubuntu but not for Ubuntu, then I assert that we do have a bug *somewhere*, and we should get to the bottom of this.)

[Erich Eickmeyer (eeickmeyer)]

Removed snapd from extra packages, added minimal, standard, and standard-raspi-common to rootfs/seed/names. Working on a test build now, though I do have LP: #2045336 open as the build is currently failing to complete not only on the Edubuntu build but also on the Ubuntu build. However, that doesn't appear to be a failure in the yaml.

[Paul Mars (upils)]

I tried to run it and germinate is failing with the following error:

Error: Error opening seed file /home/paul/scratch/edubuntu/germinate/standard-raspi-common.seed: "open /home/paul/scratch/edubuntu/germinate/standard-raspi-common.seed: no such file or directory"

I guess this file being absent is the result of another error germinate encounter earlier in the execution:

* Cloning branch noble of git://git.launchpad.net/~edubuntu-dev/ubuntu-seeds/+git/platform/
Cloning into '/tmp/germinate-d_vkgymr/platform.noble'...
fatal: remote error: Repository '~edubuntu-dev/ubuntu-seeds/+git/platform' not found.

I do not know enough yet about germinate to tell you exactly what is missing but I think a fix in your ubuntu-seed repo is needed.

review: Needs Fixing

[Steve Langasek (vorlon)]

Paul, the config lists two base urls for seeds:
+ - "git://git.launchpad.net/~edubuntu-dev/ubuntu-seeds/+git/"
+ - "git://git.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/+git/"
This is because the platform seed is common to all flavors and maintained by the Ubuntu core-dev team, the repo should NOT be branched under the edubuntu team but the seed must instead always be picked up from the common repository.

But to get past this issue at all in Erich's local testing, ubuntu-image must already properly support this?

[Paul Mars (upils)]

u-i already handle several seed URLs, and give them to germinate with the --seed-source option (comma separated values).

Then u-i will try to install the packages listed in the seed named in rootfs.seed.names in the YAML. Here the standard-raspi-common seed is listed but was not "fetched" (I do not know the right term here) during the germinate execution.

So It looks like u-i is working as expected but something is missing in the seeds?

[Erich Eickmeyer (eeickmeyer)]

Likewise, in my last test yesterday, I ran into the same issue as Paul, which indicates that germinate is not pulling the platform seeds for whatever reason. I'm running this on a Pi Zero 2 W courtesy Dave so my tests are rather slow.

[Steve Langasek (vorlon)]

Ok you're right, this was a typo in Erich's update to the branch: the correct name is supported-raspi-common, not standard-raspi-common.

[Erich Eickmeyer (eeickmeyer)]

> Ok you're right, this was a typo in Erich's update to the branch: the correct
> name is supported-raspi-common, not standard-raspi-common.

oops, fixing

[Erich Eickmeyer (eeickmeyer)]

Latest test with the latest commit of edubuntu-pi-arm64.yaml was a success with the exception of previously mentioned LP: #2045336. Once that bug is resolved I'll be able to build a full test image again.

[Erich Eickmeyer (eeickmeyer)]

The good news is the previous issue is now resolved, but I'm blocked by a new bug in LP: #2048922 in my testing.

[Erich Eickmeyer (eeickmeyer)]

Image now builds and is tested on a Raspberry Pi 5. Slow to initial boot, but that seems par for the course with these images.

[Steve Langasek (vorlon)]

Thanks, this looks ok now. The only thing I see different between the ubuntu yaml and this latest edubuntu yaml, which was present in the original but I overlooked, is hard-coding squashfs-tools in the list of extra-packages for the image. Why was this needed? It seems a very strange manual addition to an image.

Not blocking on this question, but I think you probably should clean that up (either removing it directly, or filing a bug against whatever is preventing you from removing it, or seeding it in desktop-gnome-raspi)

review: Approve

[Erich Eickmeyer (eeickmeyer)]

> Not blocking on this question, but I think you probably should clean that up (either removing it directly, or filing a bug against whatever is preventing you from removing it, or seeding it in desktop-gnome-raspi)

Agreed, especially since my latest test build without it built successfully, which completed as of this comment. In early testing, however, it did require it and errored without the `unsquashfs` command being available to the chroot, so this was a workaround that proved to be temporary. Therefore, a new MP will be coming in.

diff --git a/edubuntu-pi-arm64.yaml b/edubuntu-pi-arm64.yaml
new file mode 100755
index 0000000..fd98a75
--- /dev/null
+++ b/edubuntu-pi-arm64.yaml
@@ -0,0 +1,89 @@
+name: edubuntu-desktop-raspi-arm64
+display-name: Edubuntu Preinstalled Desktop Raspberry Pi arm64
+revision: 1
+architecture: arm64
+series: noble
+class: preinstalled
+kernel: linux-image-raspi
+gadget:
+  url: "https://git.launchpad.net/snap-pi"
+  branch: "classic"
+  type: "git"
+  target: "desktop"
+rootfs:
+  archive: ubuntu
+  flavor: edubuntu
+  components:
+    - main
+    - restricted
+    - universe
+    - multiverse
+  mirror: "http://ports.ubuntu.com/ubuntu-ports/"
+  pocket: updates
+  seed:
+    urls:
+      - "git://git.launchpad.net/~edubuntu-dev/ubuntu-seeds/+git/"
+      - "git://git.launchpad.net/~ubuntu-core-dev/ubuntu-seeds/+git/"
+    branch: noble
+    names:
+      - raspi-common
+      - minimal
+      - standard
+      - supported-raspi-common
+      - desktop-gnome-minimal
+      - desktop-gnome
+      - desktop-gnome-raspi
+      - raspi-common
+      - fonts
+      - ubuntu-edu-preschool
+      - ubuntu-edu-primary
+      - ubuntu-edu-secondary
+      - ubuntu-edu-tertiary
+customization:
+  extra-snaps:
+    - name: snapd
+    - name: bare
+    - name: gnome-42-2204
+      channel: stable/ubuntu-24.04
+    - name: gtk-common-themes
+      channel: stable/ubuntu-24.04
+    - name: firefox
+      channel: stable/ubuntu-24.04
+    - name: snap-store
+      channel: stable/ubuntu-24.04
+    - name: snapd-desktop-integration
+      channel: stable/ubuntu-24.04
+  extra-packages:
+    - name: oem-config-gtk
+    - name: oem-config
+    - name: ubiquity-frontend-gtk
+    - name: language-pack-en-base
+    - name: edubuntu-live-settings
+    - name: ubiquity-slideshow-edubuntu
+    - name: squashfs-tools
+  fstab:
+    - label: "writable"
+      mountpoint: "/"
+      filesystem-type: "ext4"
+      mount-options: "discard"
+      dump: false
+      fsck-order: 1
+    - label: "system-boot"
+      mountpoint: "/boot/firmware"
+      filesystem-type: "vfat"
+      mount-options: "defaults"
+      dump: false
+      fsck-order: 1
+# FIXME: Temporarily, we also need to make sure that for desktop pi images
+#  we actually run oem-config-prepare before first boot. Otherwise we won't
+#  be able to boot into oem-config properly.
+#  This should be done via a package postinst ideally, so this manual
+#  customization should be only temporary.
+  manual:
+    execute:
+      - path: "/usr/sbin/oem-config-prepare"
+artifacts:
+  img:
+    - name: edubuntu-24.04-preinstalled-desktop-arm64+raspi.img
+  manifest:
+    name: edubuntu-24.04-preinstalled-desktop-arm64+raspi.manifest