Don't install spyro2 rando client

.gitlab-ci.yml

@@ -20,7 +20,6 @@ variables:
   RUST_LOG_STYLE: always
   BB_SIGNING_DRIVER: sigstore
   BB_BUILD_PUSH: 'true'
-  BB_BUILD_CHUNKED_OCI: 'true'
   CLICOLOR_FORCE: 1
   TAG: main
 
@@ -28,6 +27,7 @@ default:
   services:
     - docker:dind
   interruptible: true
+  retry: 2
   image: ghcr.io/blue-build/cli:$TAG
   before_script:
     - curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash
@@ -44,6 +44,7 @@ base-images:
   stage: base-images
   variables:
     BB_BUILD_CHUNKED_OCI_MAX_LAYERS: '64'
+    BB_BUILD_CHUNKED_OCI: 'true'
   rules:
     # Run when any of the base recipes change
     - changes:

files/scripts/installnvidia.sh

@@ -24,17 +24,8 @@ chmod 1777 /var/tmp
 ##################################
 KERNEL_VERSION="$(rpm -q "kernel" --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
 RELEASE="$(rpm -E '%fedora.%_arch')"
-if [[ "$IMAGE_NAME" == *"open"* ]]; then
-    curl -fLsS --retry 5 -o /etc/yum.repos.d/negativo17-fedora-nvidia.repo https://negativo17.org/repos/fedora-nvidia.repo
-    sed -i '/^enabled=1/a\priority=90' /etc/yum.repos.d/negativo17-fedora-nvidia.repo
-else 
-    curl -fLsS --retry 5 -o /etc/yum.repos.d/fedora-nvidia-580.repo https://negativo17.org/repos/fedora-nvidia-580.repo
-    sed -i '/^enabled=1/a\priority=90' /etc/yum.repos.d/fedora-nvidia-580.repo
-
-    if [ -f /etc/yum.repos.d/fedora-multimedia.repo ]; then
-        sed -i 's/^enabled=.*/enabled=0/' /etc/yum.repos.d/fedora-multimedia.repo
-    fi
-fi
+curl -fLsS --retry 5 -o /etc/yum.repos.d/negativo17-fedora-nvidia.repo https://negativo17.org/repos/fedora-nvidia.repo
+sed -i '/^enabled=1/a\priority=90' /etc/yum.repos.d/negativo17-fedora-nvidia.repo
 
 #################################
 # Kernel module
@@ -61,6 +52,7 @@ modinfo /usr/lib/modules/${KERNEL_VERSION}/extra/nvidia/nvidia{,-drm,-modeset,-p
 # shellcheck disable=SC2086
 modinfo -l /usr/lib/modules/${KERNEL_VERSION}/extra/nvidia/nvidia{,-drm,-modeset,-peermem,-uvm}.ko.xz
 
+chmod +x ./signmodules.sh
 ./signmodules.sh "nvidia"
 
 ##################################

files/spyro2-client-desktop/spyro2-ap-client.desktop

@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=Spyro 2 Archipelago Client
+GenericName=Spyro 2 Client
+Exec=/opt/S2AP/S2AP.Desktop
+Categories=Game;
+StartupNotify=false

recipes/base-cosmic-nvidia.yml

@@ -2,7 +2,7 @@
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: cosmic-nvidia
 base-image: quay.io/fedora-ostree-desktops/base-atomic
-image-version: 42
+image-version: 43
 description: The base image of Wunker OS with COSMIC for Nvidia
 modules:
   - from-file: base/common.yml

recipes/base-cosmic.yml

@@ -2,7 +2,7 @@
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: cosmic
 base-image: quay.io/fedora-ostree-desktops/base-atomic
-image-version: 42
+image-version: 43
 description: The base image of Wunker OS with COSMIC
 modules:
   - from-file: base/common.yml

recipes/base-kinoite-nvidia.yml

@@ -2,7 +2,7 @@
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: kinoite-nvidia
 base-image: quay.io/fedora-ostree-desktops/kinoite
-image-version: 42
+image-version: 43
 description: The base image of Wunker OS with Plasma for Nvidia
 modules:
   - from-file: base/common.yml

recipes/base-kinoite.yml

@@ -2,7 +2,7 @@
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: kinoite
 base-image: quay.io/fedora-ostree-desktops/kinoite
-image-version: 42
+image-version: 43
 description: The base image of Wunker OS with Plasma
 modules:
   - from-file: base/common.yml

recipes/base-nvidia.yml

@@ -2,7 +2,7 @@
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: base-nvidia
 base-image: quay.io/fedora-ostree-desktops/base-atomic
-image-version: 42
+image-version: 43
 description: The base image of Wunker OS
 modules:
   - from-file: base/common.yml

recipes/base.yml

@@ -2,7 +2,7 @@
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: base
 base-image: quay.io/fedora-ostree-desktops/base-atomic
-image-version: 42
+image-version: 43
 description: The base image of Wunker OS
 modules:
   - from-file: base/common.yml

recipes/common/common.yml

@@ -1,2 +1,3 @@
 modules:
   - type: signing
+  - from-file: common/ms-fonts.yml

recipes/common/dev-packages.yml

@@ -49,7 +49,7 @@ modules:
         - patch
         - rpmdevtools
         - protobuf-compiler
-        # - helix
+        - helix
         - tofu
         - terraform
         - terraform-ls

recipes/common/ms-fonts.yml

@@ -5,4 +5,6 @@ modules:
         - cabextract
         - xorg-x11-font-utils
         - fontconfig
-        - https://downloads.sourceforge.net/project/mscorefonts2/rpms/msttcore-fonts-installer-2.6-1.noarch.rpm
+  - type: script
+    snippets:
+      - rpm -i --nodigest https://downloads.sourceforge.net/project/mscorefonts2/rpms/msttcore-fonts-installer-2.6-1.noarch.rpm

recipes/common/spyro2-rando-client.yaml

@@ -12,6 +12,10 @@ stages:
         scripts:
           - build-spyro2-client.sh
 modules:
+  - type: files
+    files:
+      - source: spyro2-client-desktop
+        destination: /usr/share/applications/
   - type: copy
     from: spyro2
     src: /app/S2AP/source/S2AP.Desktop/bin/Release/net8.0/linux-x64/publish/*

recipes/cp-laptop.yml

@@ -4,8 +4,6 @@ name: cp-laptop
 base-image: registry.gitlab.com/wunker-bunker/wunker-os/kinoite
 image-version: latest
 description: The image of Wunker OS for CP's laptop.
-stages:
-  - from-file: common/spyro2-rando-client.yaml
 modules:
   - from-file: common/common.yml
   - type: dnf
@@ -28,7 +26,5 @@ modules:
   - type: script
     scripts:
       - install-archipelago.sh
-  - from-file: common/ms-fonts.yml
   - from-file: common/updates.yml
-  - from-file: common/spyro2-rando-client.yaml
   - from-file: common/post-build.yml

recipes/jp-desktop-nvidia.yml

@@ -6,24 +6,9 @@ image-version: latest
 description: The image of Wunker OS for JP's desktop gaming.
 blue-build-tag: none
 nushell-version: none
-stages:
-  - from-file: common/helix.yml
-  - from-file: common/spyro2-rando-client.yaml
-  # - name: cosmic-comp
-  #   from: rust
-  #   modules:
-  #     - type: cosmic
-  #       source: local
-  #       component: cosmic-comp
-  #       # ref: bebd7c5c40c038470d2eef0501a3efb34f2df966 # Known bug commit
-  #       # ref: db13eea91c15ca57d76454432d1fb9c09c51ba8c # Last known working commit
-  #       ref: 605bb63a4de640b77f6d3017238ece48cb286933 # supposed fix
+# stages:
+#   - from-file: common/helix.yml
 modules:
   - from-file: common/jp-desktop.yml
-  - from-file: common/helix.yml
-  - from-file: common/spyro2-rando-client.yaml
-  # - type: copy
-  #   from: cosmic-comp
-  #   src: /out/cosmic-comp
-  #   dest: /usr/bin/cosmic-comp
+  # - from-file: common/helix.yml
   - from-file: common/post-build.yml

recipes/jp-laptop.yml

@@ -4,9 +4,9 @@ name: jp-laptop
 base-image: registry.gitlab.com/wunker-bunker/wunker-os/combo
 image-version: latest
 description: The image of Wunker OS for JP's Laptop.
-stages:
-  - from-file: common/helix.yml
+# stages:
+#   - from-file: common/helix.yml
 modules:
   - from-file: common/jp-laptop.yml
-  - from-file: common/helix.yml
+  # - from-file: common/helix.yml
   - from-file: common/post-build.yml

recipes/pg-desktop-nvidia.yml

@@ -7,7 +7,6 @@ description: The image of Wunker OS for PG's desktop gaming.
 modules:
   - from-file: common/common.yml
   - from-file: common/updates.yml
-  - from-file: common/ms-fonts.yml
   - from-file: common/gaming.yml
   - type: dnf
     install: