Don't install ares

.gitlab-ci.yml

@@ -45,6 +45,7 @@ base-images:
   variables:
     BB_BUILD_CHUNKED_OCI: 'true'
     BB_BUILD_CHUNKED_OCI_MAX_LAYERS: '64'
+    # BB_BUILD_RECHUNK_CLEAR_PLAN: 'true'
   rules:
     # Run when any of the base recipes change
     - changes:

files/scripts/build-ares.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+cd /
+mkdir out
+git clone --branch "${ARES_VERSION:-master}" https://github.com/ares-emulator/ares
+cd ares
+mkdir build && cd build
+cmake .. -G Ninja
+cmake --build .
+cmake --install . --prefix /out
+sed -i 's|Exec=.*|Exec=/usr/bin/ares|' /out/share/applications/ares.desktop
+sed -i 's|Icon=.*|Icon=/usr/share/icons/hicolor/256x256/apps/ares.png|' /out/share/applications/ares.desktop

justfile

@@ -1,5 +1,7 @@
-export BB_REGISTRY := "registry.gitlab.com"
+# export BB_REGISTRY := "registry.gitlab.com"
-export BB_REGISTRY_NAMESPACE := "wunker-bunker/wunker-os"
+# export BB_REGISTRY_NAMESPACE := "wunker-bunker/wunker-os"
+export BB_REGISTRY := "harbor.jpnet.dev"
+export BB_REGISTRY_NAMESPACE := "wunker-os"
 export BB_GENISO_SECURE_BOOT_URL := "https://gitlab.com/wunker-bunker/wunker-os/-/raw/main/files/base/etc/pki/akmods/certs/akmods-wunker-bunker.der"
 export BB_GENISO_ENROLLMENT_PASSWORD := "wunker"
 export BB_GENISO_VARIANT := "kinoite"

recipes/base-combo-nvidia.yml

@@ -1,8 +1,8 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: combo-nvidia
-base-image: harbor.jpnet.dev/fedora-ostree-desktops/kinoite
+base-image: ${BB_REGISTRY:-quay.io}/fedora-ostree-desktops/kinoite
-image-version: 43
+image-version: ${FEDORA_VERSION}
 description: The base image of Wunker OS with COSMIC and Plasma for Nvidia
 modules:
   - from-file: base/common.yml

recipes/base-combo.yml

@@ -1,8 +1,8 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: combo
-base-image: harbor.jpnet.dev/fedora-ostree-desktops/kinoite
+base-image: ${BB_REGISTRY:-quay.io}/fedora-ostree-desktops/kinoite
-image-version: 43
+image-version: ${FEDORA_VERSION}
 description: The base image of Wunker OS with COSMIC and Plasma
 modules:
   - from-file: base/common.yml

recipes/base-cosmic-nvidia.yml

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

recipes/base-cosmic.yml

@@ -1,8 +1,8 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: cosmic
-base-image: harbor.jpnet.dev/fedora-ostree-desktops/base-atomic
+base-image: ${BB_REGISTRY:-quay.io}/fedora-ostree-desktops/base-atomic
-image-version: 43
+image-version: ${FEDORA_VERSION}
 description: The base image of Wunker OS with COSMIC
 modules:
   - from-file: base/common.yml

recipes/base-kinoite-nvidia.yml

@@ -1,8 +1,8 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: kinoite-nvidia
-base-image: harbor.jpnet.dev/fedora-ostree-desktops/kinoite
+base-image: ${BB_REGISTRY:-quay.io}/fedora-ostree-desktops/kinoite
-image-version: 43
+image-version: ${FEDORA_VERSION}
 description: The base image of Wunker OS with Plasma for Nvidia
 modules:
   - from-file: base/common.yml

recipes/base-kinoite.yml

@@ -1,8 +1,8 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: kinoite
-base-image: harbor.jpnet.dev/fedora-ostree-desktops/kinoite
+base-image: ${BB_REGISTRY:-quay.io}/fedora-ostree-desktops/kinoite
-image-version: 43
+image-version: ${FEDORA_VERSION}
 description: The base image of Wunker OS with Plasma
 modules:
   - from-file: base/common.yml

recipes/base-nvidia.yml

@@ -1,8 +1,8 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: base-nvidia
-base-image: harbor.jpnet.dev/fedora-ostree-desktops/base-atomic
+base-image: ${BB_REGISTRY:-quay.io}/fedora-ostree-desktops/base-atomic
-image-version: 43
+image-version: ${FEDORA_VERSION}
 description: The base image of Wunker OS
 modules:
   - from-file: base/common.yml

recipes/base.yml

@@ -1,8 +1,8 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: base
-base-image: harbor.jpnet.dev/fedora-ostree-desktops/base-atomic
+base-image: ${BB_REGISTRY:-quay.io}/fedora-ostree-desktops/base-atomic
-image-version: 43
+image-version: ${FEDORA_VERSION}
 description: The base image of Wunker OS
 modules:
   - from-file: base/common.yml

recipes/base/common.yml

@@ -129,7 +129,7 @@ modules:
       CSFG: /usr/lib/systemd/system-generators/coreos-sulogin-force-generator
     snippets:
       # Lock the drivers and kernel versions
-      - dnf5 versionlock add kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra libva intel-gmmlib intel-vpl-gpu-rt intel-mediasdk libva-intel-media-driver mesa-dri-drivers mesa-filesystem mesa-libEGL mesa-libGL mesa-libgbm mesa-va-drivers mesa-vulkan-drivers
+      # - dnf5 versionlock add kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra libva intel-gmmlib intel-vpl-gpu-rt intel-mediasdk libva-intel-media-driver mesa-dri-drivers mesa-filesystem mesa-libEGL mesa-libGL mesa-libgbm mesa-va-drivers mesa-vulkan-drivers
 
       # use CoreOS' generator for emergency/rescue boot
       # see detail: https://github.com/ublue-os/main/issues/653

recipes/common/gaming.yml

@@ -1,12 +1,34 @@
 ---
-# yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
+# yaml-language-server: $schema=https://schema.blue-build.org/module-stage-list-v1.json
+stages: []
+  # - from: fedora
+  #   name: ares
+  #   modules:
+  #     - type: dnf
+  #       install:
+  #         packages:
+  #           - cmake
+  #           - pkg-config
+  #           - curl
+  #           - git
+  #           - clang
+  #           - ninja-build
+  #           - ccache
+  #           - libX11-devel
+  #           - libXrandr-devel
+  #           - mesa-libGL-devel
+  #           - gtk3-devel
+  #           - openal-soft-devel
+  #           - alsa-lib-devel
+  #           - SDL3-devel
+  #           - pulseaudio-libs-devel
+  #           - libao-devel
+  #     - type: script
+  #       env:
+  #         ARES_VERSION: v147
+  #       scripts:
+  #         - build-ares.sh
 modules:
-  - type: files
-    files:
-      - source: steam-firewall
-        destination: /
-      - source: archipelago
-        destination: /
   - type: dnf
     repos:
       cleanup: true
@@ -16,6 +38,19 @@ modules:
         - https://github.com/ebkr/r2modmanPlus/releases/download/v3.2.10/r2modman-3.2.10.x86_64.rpm
         - steam
         - mono-core
+
+  - type: files
+    files:
+      - source: steam-firewall
+        destination: /
+      - source: archipelago
+        destination: /
+
   - type: script
     scripts:
       - install-archipelago.sh
+
+  # - type: copy
+  #   from: ares
+  #   src: /out
+  #   dest: /usr/

recipes/common/jp-common.yml

@@ -1,5 +1,7 @@
 ---
-# yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
+# yaml-language-server: $schema=https://schema.blue-build.org/module-stage-list-v1.json
+stages:
+  - from-file: common/gaming.yml
 modules:
   - from-file: common/common.yml
   - from-file: common/pipewire-tweaks.yml

recipes/common/jp-desktop.yml

@@ -1,5 +1,7 @@
 ---
-# yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
+# yaml-language-server: $schema=https://schema.blue-build.org/module-stage-list-v1.json
+stages:
+  - from-file: common/jp-common.yml
 modules:
   - type: files
     files:

recipes/common/jp-laptop.yml

@@ -1,5 +1,7 @@
 ---
-# yaml-language-server: $schema=https://schema.blue-build.org/module-list-v1.json
+# yaml-language-server: $schema=https://schema.blue-build.org/module-stage-list-v1.json
+stages:
+  - from-file: common/jp-common.yml
 modules:
   # - from-file: common/bootc-setup.yml
   - type: dnf

recipes/cp-laptop.yml

@@ -1,7 +1,7 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: cp-laptop
-base-image: harbor.jpnet.dev/wunker-os/kinoite
+base-image: ${BB_REGISTRY:-registry.gitlab.com}/${BB_REGISTRY_NAMESPACE:-wunker-bunker/wunker-os}/kinoite
 image-version: latest
 description: The image of Wunker OS for CP's laptop.
 modules:

recipes/jp-desktop-nvidia.yml

@@ -1,14 +1,13 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: jp-desktop-nvidia
-base-image: harbor.jpnet.dev/wunker-os/combo-nvidia
+base-image: ${BB_REGISTRY:-registry.gitlab.com}/${BB_REGISTRY_NAMESPACE:-wunker-bunker/wunker-os}/combo-nvidia
 image-version: latest
 description: The image of Wunker OS for JP's desktop gaming.
 blue-build-tag: none
 nushell-version: none
-# stages:
+stages:
-#   - from-file: common/helix.yml
+  - from-file: common/jp-desktop.yml
 modules:
   - from-file: common/jp-desktop.yml
-  # - from-file: common/helix.yml
   - from-file: common/post-build.yml

recipes/jp-laptop.yml

@@ -1,12 +1,11 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: jp-laptop
-base-image: harbor.jpnet.dev/wunker-os/combo
+base-image: ${BB_REGISTRY:-registry.gitlab.com}/${BB_REGISTRY_NAMESPACE:-wunker-bunker/wunker-os}/combo
 image-version: latest
 description: The image of Wunker OS for JP's Laptop.
-# stages:
+stages:
-#   - from-file: common/helix.yml
+  - from-file: common/jp-laptop.yml
 modules:
   - from-file: common/jp-laptop.yml
-  # - from-file: common/helix.yml
   - from-file: common/post-build.yml

recipes/pg-desktop-nvidia.yml

@@ -1,9 +1,11 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: pg-desktop-nvidia
-base-image: harbor.jpnet.dev/wunker-os/kinoite-nvidia
+base-image: ${BB_REGISTRY:-registry.gitlab.com}/${BB_REGISTRY_NAMESPACE:-wunker-bunker/wunker-os}/kinoite-nvidia
 image-version: latest
 description: The image of Wunker OS for PG's desktop gaming.
+stages:
+  - from-file: common/gaming.yml
 modules:
   - from-file: common/common.yml
   - from-file: common/updates.yml

recipes/wke-fw-desktop.yml

@@ -1,7 +1,7 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: wke
-base-image: harbor.jpnet.dev/wunker-os/base
+base-image: ${BB_REGISTRY:-registry.gitlab.com}/${BB_REGISTRY_NAMESPACE:-wunker-bunker/wunker-os}/base
 image-version: latest
 description: The image of Wunker OS for RKE2 Worker
 alt-tags:

recipes/wke-server.yml

@@ -1,7 +1,7 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: wke
-base-image: harbor.jpnet.dev/wunker-os/base
+base-image: ${BB_REGISTRY:-registry.gitlab.com}/${BB_REGISTRY_NAMESPACE:-wunker-bunker/wunker-os}/base
 image-version: latest
 description: The image of Wunker OS for RKE2 Server
 alt-tags:

recipes/wke-worker.yml

@@ -1,7 +1,7 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: wke
-base-image: harbor.jpnet.dev/wunker-os/base
+base-image: ${BB_REGISTRY:-registry.gitlab.com}/${BB_REGISTRY_NAMESPACE:-wunker-bunker/wunker-os}/base
 image-version: latest
 description: The image of Wunker OS for RKE2 Worker
 alt-tags: