snap: migrate to base: core24

.github/workflows/snap.yml

@@ -31,6 +31,7 @@ jobs:
       with:
         architecture: ${{ matrix.platform }}
         snapcraft-token: ${{ secrets.SNAPCRAFT_TOKEN }}
+        snapcraft-channel: edge
         launchpad-credentials: ${{ secrets.LAUNCHPAD_CREDENTIALS }}
         launchpad-accept-public-upload: true
         publish: ${{ github.event_name == 'pull_request' && github.repository == github.event.pull_request.head.repo.full_name }}

snap/snapcraft.yaml

@@ -3,13 +3,13 @@ adopt-info: mir-test-tools
 summary: Mir test scripts and applications
 description: Mir test scripts and applications
 confinement: strict
-base: core22
+base: core24
 
-architectures:
-  - build-on: amd64
-  - build-on: arm64
-  - build-on: armhf
-  - build-on: riscv64
+platforms:
+  amd64:
+  arm64:
+  armhf:
+  riscv64:
 
 package-repositories:
   - type: apt
@@ -27,24 +27,34 @@ environment:
   XDG_CONFIG_DIRS: $SNAP/etc/xdg
   XDG_CACHE_HOME:  $SNAP_USER_COMMON/.cache
   # Prep for Mir
-  MIR_SERVER_PLATFORM_PATH: ${SNAP}/usr/lib/${CRAFT_ARCH_TRIPLET}/mir/server-platform
+  MIR_SERVER_PLATFORM_PATH: ${SNAP}/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/mir/server-platform
   MIR_SERVER_X11_WINDOW_TITLE: ${SNAP_INSTANCE_NAME}
 
 apps:
   smoke-test:
     command-chain:
       - bin/wrapper
-      - bin/graphics-core22-wrapper
+      - bin/gpu-2404-wrapper
     command: usr/bin/mir-smoke-test-runner
+    plugs: &plugs
+      - audio-playback
+      - gpu-2404
+      - login-session-control
+      - network-bind
+      - opengl
+      - pulseaudio
+      - x11
+    slots: &slots
+      - wayland
 
   # SDL2 example
   sdl2-test:
     command-chain:
       - bin/wrapper
-      - bin/graphics-core22-wrapper
+      - bin/gpu-2404-wrapper
     command: usr/bin/mir_demo_server --test-client neverputt
-    plugs:
-      - pulseaudio
+    plugs: *plugs
+    slots: *slots
     environment:
       # Alsa config
       ALSA_CONFIG_DIR: $SNAP/usr/share/alsa
@@ -58,20 +68,24 @@ apps:
   qt-test:
     command-chain:
       - bin/wrapper
-      - bin/graphics-core22-wrapper
+      - bin/gpu-2404-wrapper
     command: usr/bin/mir_demo_server --test-client $SNAP/qml/spinning-rect.sh
+    plugs: *plugs
+    slots: *slots
     environment:
       # Prep for Qt wayland
-      QT_PLUGIN_PATH: ${SNAP}/usr/lib/${CRAFT_ARCH_TRIPLET}/qt5/plugins/
-      QT_QPA_PLATFORM_PLUGIN_PATH: ${SNAP}/usr/lib/${CRAFT_ARCH_TRIPLET}/qt5/plugins/platforms/
-      QML2_IMPORT_PATH: ${SNAP}/usr/lib/${CRAFT_ARCH_TRIPLET}/qt5/qml
+      QT_PLUGIN_PATH: ${SNAP}/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/qt5/plugins/
+      QT_QPA_PLATFORM_PLUGIN_PATH: ${SNAP}/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/qt5/plugins/platforms/
+      QML2_IMPORT_PATH: ${SNAP}/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/qt5/qml
 
   # GTK3+ example
   gtk3-test:
     command-chain:
       - bin/wrapper
-      - bin/graphics-core22-wrapper
+      - bin/gpu-2404-wrapper
     command: usr/bin/mir_demo_server --test-client $SNAP/gtkapp.sh
+    plugs: *plugs
+    slots: *slots
     environment:
       PATH: $SNAP/bin/:$SNAP/usr/bin/:${SNAP}/usr/games:${PATH}
 
@@ -80,61 +94,54 @@ apps:
     command-chain:
       - bin/server-wrapper
       - bin/wrapper
-      - bin/graphics-core22-wrapper
+      - bin/gpu-2404-wrapper
     command: usr/bin/mir_demo_server --test-client $SNAP/mir_flutter_app.sh --test-timeout 120
 
   performance-test:
     command-chain:
       - bin/performance-env.sh
       - bin/wrapper
-      - bin/graphics-core22-wrapper
+      - bin/gpu-2404-wrapper
     command: usr/bin/mir_performance_tests
-    plugs:
-      - network-bind
+    plugs: *plugs
+    slots: *slots
 
   demo-server:
     command-chain:
       - bin/server-wrapper
       - bin/wrapper
-      - bin/graphics-core22-wrapper
+      - bin/gpu-2404-wrapper
     command: usr/bin/mir_demo_server
+    plugs: *plugs
+    slots: *slots
 
 plugs:
-  # For Mir
-  opengl:
-  x11:
-  login-session-control:
-  graphics-core22:
+  gpu-2404:
     interface: content
-    target: $SNAP/graphics
-    default-provider: mesa-core22
-
-slots:
-  wayland:
+    target: $SNAP/gpu-2404
+    default-provider: mesa-2404
 
 layout:
   /usr/share/fonts:
     bind: $SNAP/usr/share/fonts
   /usr/share/icons:
     bind: $SNAP/usr/share/icons
-  /usr/lib/$CRAFT_ARCH_TRIPLET/gdk-pixbuf-2.0:
-    symlink: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET/gdk-pixbuf-2.0
+  /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gdk-pixbuf-2.0:
+    symlink: $SNAP/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gdk-pixbuf-2.0
   /usr/share/glmark2:
     symlink: $SNAP/usr/share/glmark2
-  /usr/share/drirc.d:  # Used by mesa-core22 for app specific workarounds
-    symlink: $SNAP/graphics/drirc.d
+  /usr/share/drirc.d:  # Used by mesa-2404 for app specific workarounds
+    symlink: $SNAP/gpu-2404/drirc.d
   /usr/share/X11/XErrorDB:
-    symlink: $SNAP/graphics/X11/XErrorDB
-  /usr/share/X11/locale:
-    symlink: $SNAP/graphics/X11/locale
+    symlink: $SNAP/gpu-2404/X11/XErrorDB
   /usr/share/X11/xkb:
     symlink: $SNAP/usr/share/X11/xkb
   /usr/bin/Xwayland:
     symlink: $SNAP/usr/bin/Xwayland
   /usr/bin/xkbcomp:
     symlink: $SNAP/usr/bin/xkbcomp
-  /usr/lib/${CRAFT_ARCH_TRIPLET}/pulseaudio:
-    symlink: $SNAP/usr/lib/${CRAFT_ARCH_TRIPLET}/pulseaudio
+  /usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/pulseaudio:
+    symlink: $SNAP/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/pulseaudio
   # these could be avoided through a desktop plug
   /etc/gtk-3.0:
     bind: $SNAP/etc/gtk-3.0
@@ -197,23 +204,26 @@ parts:
     stage-packages:
       - gnome-sudoku
     build-packages: # These are actually for override-prime - which needs them in the build environment
-      - libglib2.0-0
+      - libglib2.0-0t64
       - libgdk-pixbuf2.0-0
       - librsvg2-dev # So the libpixbufloader-svg.so loader can be loaded by gdk-pixbuf-query-loaders
     override-prime: |
       craftctl default
       # Compile the gsettings schemas
-      /usr/lib/${CRAFT_ARCH_TRIPLET}/glib-2.0/glib-compile-schemas "$CRAFT_PRIME/usr/share/glib-2.0/schemas"
+      /usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/glib-2.0/glib-compile-schemas "$CRAFT_PRIME/usr/share/glib-2.0/schemas"
       # Index the pixbuf loaders
-      GDK_PIXBUF_MODULEDIR=$CRAFT_PRIME/usr/lib/${CRAFT_ARCH_TRIPLET}/gdk-pixbuf-2.0/2.10.0/loaders \
-      "/usr/lib/$CRAFT_ARCH_TRIPLET/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders" > "$CRAFT_PRIME/usr/lib/$CRAFT_ARCH_TRIPLET/gdk-pixbuf-2.0/2.10.0/loaders.cache"
-      sed s!$CRAFT_PRIME!!g --in-place "$CRAFT_PRIME/usr/lib/$CRAFT_ARCH_TRIPLET/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+      GDK_PIXBUF_MODULEDIR=$CRAFT_PRIME/usr/lib/${CRAFT_ARCH_TRIPLET_BUILD_FOR}/gdk-pixbuf-2.0/2.10.0/loaders \
+      "/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders" > "$CRAFT_PRIME/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gdk-pixbuf-2.0/2.10.0/loaders.cache"
+      sed s!$CRAFT_PRIME!!g --in-place "$CRAFT_PRIME/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR/gdk-pixbuf-2.0/2.10.0/loaders.cache"
 
   mir-flutter-app:
     plugin: flutter
     flutter-target: lib/main.dart
     source: https://github.com/hbatagelo/mir_flutter_app.git
-    build-packages: [libgtk-3-dev, ninja-build]
+    build-packages:
+      - curl
+      - libgtk-3-dev
+      - ninja-build
     stage-packages:
       - fonts-ubuntu
       - libgtk-3-0
@@ -239,15 +249,17 @@ parts:
   xwayland:
     plugin: nil
     stage-packages:
+      - x11-xkb-utils
+      - xkb-data
       - xwayland
       - libbz2-1.0
 
-  graphics-core22:
+  gpu-snap:
     after: [mir-test-tools, icons, sdl2-apps, qmldemo, gtk3app, mir-flutter-app, performance, wrapper, xwayland]
-    source: https://github.com/MirServer/graphics-core22.git
+    source: https://github.com/canonical/gpu-snap.git
     plugin: dump
     override-prime: |
       craftctl default
-      ${CRAFT_PART_SRC}/bin/graphics-core22-cleanup mesa-core22
+      ${CRAFT_PART_SRC}/bin/gpu-2404-cleanup mesa-2404
     prime:
-      - bin/graphics-core22-wrapper
+      - bin/gpu-2404-wrapper

wrapper/wrapper

@@ -40,6 +40,6 @@ export MIR_MESA_KMS_DISABLE_MODESET_PROBE=
 
 # Use any quirks the driver needs
 mkdir -p "${XDG_CONFIG_HOME}/mir"
-ln -sf "${SNAP}/graphics/etc/mir-quirks" "${XDG_CONFIG_HOME}/mir/mir_demo_server.config"
+ln -sf "${SNAP}/gpu/etc/mir-quirks" "${XDG_CONFIG_HOME}/mir/mir_demo_server.config"
 
 exec "$@"