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

[Steve Langasek]

Review: Needs Fixing



Diff comments:

> diff --git a/edubuntu-pi-arm64.yaml b/edubuntu-pi-arm64.yaml
> new file mode 100644
> index 0000000..5aa722c
> --- /dev/null
> +++ b/edubuntu-pi-arm64.yaml
> @@ -0,0 +1,85 @@
> +name: edubuntu-desktop-raspi-arm64
> +display-name: Edubuntu Preinstalled Desktop Raspberry Pi arm64
> +revision: 3
> +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:
> +      - desktop-gnome-raspi
> +      - raspi-common
> +      - fonts
> +      - ubuntu-edu-preschool
> +      - ubuntu-edu-primary
> +      - ubuntu-edu-secondary
> +      - ubuntu-edu-tertiary

Present in the ubuntu image but missing from the edubuntu image are:
      - minimal
      - standard
      - supported-raspi-common

I don't see anything else here that would pull these in for you.

I think you probably want 'standard' to be included and that it's an oversight if it's not.  But 'minimal' absolutely must be included: it is not optional on Ubuntu systems, and we must not build any flavor images that are missing ubuntu-minimal.

> +customization:
> +  extra-snaps:
> +    - name: snapd
> +    - name: bare
> +    - name: core22

The Ubuntu image doesn't have any core snaps listed; why are you hard-coding this here?

> +    - 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: snapd

This shouldn't be necessary, snapd is part of both the edubuntu-desktop-gnome and edubuntu-desktop-gnome-raspi tasks via desktop-common

> +    - 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


-- 
https://code.launchpad.net/~edubuntu-dev/ubuntu-images/+git/ubuntu-images/+merge/456547
Your team Edubuntu Developers is subscribed to branch ~edubuntu-dev/ubuntu-images:noble.