From 91160f0fe32598da0b8c3bb1fbd94b46bbe9b0a5 Mon Sep 17 00:00:00 2001
From: Gerald Pinder <gmpinder@gmail.com>
Date: Fri, 28 Nov 2025 11:46:17 -0500
Subject: [PATCH] Set combo images to use build-chunked-oci

---
 .gitlab-ci.yml                                      | 13 +++++++++----
 .../usr/share/applications/archipelago.desktop      |  5 +++--
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 539a081..4bce91f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,8 +42,6 @@ base-images:
   extends:
     - .build
   stage: base-images
-  variables:
-    BB_BUILD_RECHUNK: 'true'
   rules:
     # Run when any of the base recipes change
     - changes:
@@ -63,10 +61,13 @@ base-images:
           # - base-nvidia.yml
           # - base-cosmic.yml
           # - base-cosmic-nvidia.yml
-          - base-combo.yml
-          - base-combo-nvidia.yml
           - base-kinoite.yml
           - base-kinoite-nvidia.yml
+        BB_BUILD_RECHUNK: 'true'
+      - RECIPE:
+          - base-combo.yml
+          - base-combo-nvidia.yml
+        BB_BUILD_CHUNKED_OCI: 'true'
 
 wke-images:
   extends:
@@ -111,6 +112,8 @@ combo-images:
   extends:
     - .build
   stage: build
+  variables:
+    BB_BUILD_CHUNKED_OCI: 'true'
   needs:
     - job: 'base-images: [base-combo.yml]'
       optional: true
@@ -123,6 +126,8 @@ combo-nvidia-images:
   extends:
     - .build
   stage: build
+  variables:
+    BB_BUILD_CHUNKED_OCI: 'true'
   needs:
     - job: 'base-images: [base-combo-nvidia.yml]'
       optional: true
diff --git a/files/archipelago/usr/share/applications/archipelago.desktop b/files/archipelago/usr/share/applications/archipelago.desktop
index e716e09..aec9041 100644
--- a/files/archipelago/usr/share/applications/archipelago.desktop
+++ b/files/archipelago/usr/share/applications/archipelago.desktop
@@ -1,7 +1,8 @@
 [Desktop Entry]
 Type=Application
-Name="Archipelago"
-GenericName="Archipelago"
+Name=Archipelago
+GenericName=Archipelago
+Icon=/opt/Archipelago/icon.png
 Exec=/opt/Archipelago/ArchipelagoLauncher
 Categories=Game;
 StartupNotify=false