Install mono-core

.gitlab-ci.yml

@@ -20,10 +20,11 @@ variables:
   RUST_LOG_STYLE: always
   BB_SIGNING_DRIVER: sigstore
   BB_CACHE_LAYERS: 'true'
+  BB_BUILD_PUSH: 'true'
   CLICOLOR_FORCE: 1
   TAG: main
 
-.build:
+default:
   services:
     - docker:dind
   interruptible: true
@@ -32,6 +33,8 @@ variables:
     - curl --silent "https://gitlab.com/gitlab-org/incubation-engineering/mobile-devops/download-secure-files/-/raw/main/installer" | bash
     - export COSIGN_PRIVATE_KEY=$(cat .secure_files/cosign.key)
     - sleep 5
+
+.build:
   script:
     - bluebuild build "./recipes/${RECIPE}"
 
@@ -40,7 +43,6 @@ base-images:
     - .build
   stage: base-images
   variables:
-    BB_BUILD_PUSH: 'true'
     BB_BUILD_RECHUNK: 'true'
   rules:
     # Run when any of the base recipes change
@@ -56,7 +58,7 @@ base-images:
     - when: never
   parallel:
     matrix:
-      - BASE:
+      - RECIPE:
           - base.yml
           # - base-nvidia.yml
           # - base-cosmic.yml
@@ -65,31 +67,54 @@ base-images:
           - base-combo-nvidia.yml
           - base-kinoite.yml
           # - base-kinoite-nvidia.yml
-  script:
-    - bluebuild build "./recipes/${BASE}"
 
-build-images:
+wke-images:
   extends:
     - .build
   stage: build
-  variables:
-    BB_BUILD_PUSH: 'true'
+  needs:
+    - job: 'base-images: [base.yml]'
+      optional: true
   parallel:
     matrix:
       - RECIPE:
           - wke-worker.yml
           - wke-fw-desktop.yml
           - wke-server.yml
-        BASE: base.yml
-      - RECIPE: cp-laptop.yml
-        BASE: base-kinoite.yml
-      - RECIPE: jp-desktop-nvidia.yml
-        BASE: base-combo-nvidia.yml
-      - RECIPE: jp-laptop.yml
-        BASE: base-combo.yml
+
+kinoite-images:
+  extends:
+    - .build
+  stage: build
   needs:
-    - job: base-images
+    - job: 'base-images: [base-kinoite.yml]'
       optional: true
   parallel:
     matrix:
-          - BASE: $BASE
+      - RECIPE:
+          - cp-laptop.yml
+
+combo-images:
+  extends:
+    - .build
+  stage: build
+  needs:
+    - job: 'base-images: [base-combo.yml]'
+      optional: true
+  parallel:
+    matrix:
+      - RECIPE:
+          - jp-laptop.yml
+
+combo-nvidia-images:
+  extends:
+    - .build
+  stage: build
+  needs:
+    - job: 'base-images: [base-combo-nvidia.yml]'
+      optional: true
+  parallel:
+    matrix:
+      - RECIPE:
+          - jp-desktop-nvidia.yml
+

justfile

@@ -4,19 +4,30 @@ export BB_GENISO_SECURE_BOOT_URL := "https://gitlab.com/wunker-bunker/wunker-os/
 export BB_GENISO_ENROLLMENT_PASSWORD := "wunker"
 export BB_GENISO_VARIANT := "kinoite"
 
-generate-iso recipe tag="latest":
+build *args:
+    bluebuild build {{args}}
+
+generate-iso recipe:
     #!/usr/bin/env nu
-    let name = open {{ recipe }} | get name
+    let recipe = open {{ recipe }}
+        | default [] alt-tags
+        | select name alt-tags
+    let tag = if ($recipe.alt-tags | is-empty) {
+        'latest'
+    } else {
+        $recipe.alt-tags | first
+    }
+    let name = $recipe.name
     let image = $'(
             $env.BB_REGISTRY
         )/(
             $env.BB_REGISTRY_NAMESPACE
         )/(
             $name
-        ):{{ tag }}'
+        ):($tag)'
     (^bluebuild
         generate-iso
-        --iso-name $'($name).iso'
+        --iso-name $'($name)-($tag).iso'
         --output-dir .iso/
         image $image)
 

recipes/base/common.yml

@@ -21,7 +21,6 @@ modules:
         - ublue-os/packages
         - ublue-os/staging
     install:
-      install-weak-deps: false
       packages:
         - bootc
         - ublue-os-just
@@ -99,7 +98,6 @@ modules:
       auto-remove: false
       packages:
         - fedora-flathub-remote
-        - fedora-third-party
     replace:
       # mitigate upstream packaging bug: https://bugzilla.redhat.com/show_bug.cgi?id=2332429
       # swap the incorrectly installed OpenCL-ICD-Loader for ocl-icd, the expected package
@@ -138,14 +136,10 @@ modules:
       - chmod +x ${CSFG}
 
       # Adjust ublue just recipes
-      - rm -f /usr/share/ublue-os/just/30-distrobox.just /usr/share/ublue-os/just/40-nvidia.just /usr/share/ublue-os/just/50-akmods.just
       - sed -i 's|rpm-ostreed-automatic\.timer|bootc-fetch-apply-updates.timer|g' /usr/share/ublue-os/just/10-update.just
       - sed -i 's|update_command "rpm-ostree update"|update_command "sudo bootc upgrade"|g' /usr/share/ublue-os/just/10-update.just
       - sed -i 's|/etc/pki/akmods/certs/akmods-ublue\.der|/etc/pki/akmods/certs/akmods-wunker-bunker.der|g' /usr/share/ublue-os/just/00-default.just
       - sed -i 's|"universalblue"|"wunker"|g' /usr/share/ublue-os/just/00-default.just
-      - sed -i 's|import "/usr/share/ublue-os/just/30-distrobox\.just"\n||' /usr/share/ublue-os/justfile
-      - sed -i 's|import "/usr/share/ublue-os/just/40-nvidia\.just"\n||' /usr/share/ublue-os/justfile
-      - sed -i 's|import "/usr/share/ublue-os/just/50-akmods\.just"\n||' /usr/share/ublue-os/justfile
 
       # Add SUDO_ASKPASS as a global environment
       - echo "SUDO_ASKPASS=/usr/libexec/openssh/ssh-askpass" >> /etc/environment

recipes/common/gaming.yml

@@ -13,3 +13,4 @@ modules:
       packages:
         - https://github.com/ebkr/r2modmanPlus/releases/download/v3.2.3/r2modman-3.2.3.x86_64.rpm
         - steam
+        - mono-core

recipes/wke-fw-desktop.yml

@@ -13,6 +13,10 @@ modules:
       - amdttm.pages_limit=27648000
       - amdttm.page_pool_size=13824000
   - from-file: common/wke.yml
+  - type: dnf
+    install:
+      packages:
+        - ramalama
   - type: script
     snippets:
       - curl -sfL https://get.rke2.io | INSTALL_RKE2_TYPE=agent INSTALL_RKE2_SKIP_RELOAD=true sh

recipes/wke-server.yml

@@ -1,7 +1,7 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: wke
-base-image: ghcr.io/ublue-os/base-main
+base-image: registry.gitlab.com/wunker-bunker/wunker-os/base
 image-version: 42
 description: The image of Wunker OS for RKE2 Server
 alt-tags: