From 2092f632c68bc0aaa9f62249b30106d41af62786 Mon Sep 17 00:00:00 2001 From: Gerald Pinder Date: Sun, 26 Apr 2026 14:28:24 -0400 Subject: [PATCH] Install ares --- files/scripts/build-ares.sh | 32 ++++++++++++++++++++++++++++++++ justfile | 8 ++++---- recipes/common/gaming.yml | 30 +++++++++++++++++++++++------- recipes/common/jp-common.yml | 4 +++- recipes/common/jp-desktop.yml | 4 +++- recipes/common/jp-laptop.yml | 4 +++- recipes/jp-desktop-nvidia.yml | 5 ++--- recipes/jp-laptop.yml | 5 ++--- recipes/pg-desktop-nvidia.yml | 2 ++ 9 files changed, 74 insertions(+), 20 deletions(-) create mode 100644 files/scripts/build-ares.sh diff --git a/files/scripts/build-ares.sh b/files/scripts/build-ares.sh new file mode 100644 index 0000000..5163296 --- /dev/null +++ b/files/scripts/build-ares.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env bash + +set -euo pipefail + +dnf -y install \ + 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 + +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/ares/ares.png|' /out/share/applications/ares.desktop diff --git a/justfile b/justfile index 0afe3af..732bc5d 100644 --- a/justfile +++ b/justfile @@ -1,7 +1,7 @@ -export BB_REGISTRY := "registry.gitlab.com" -export BB_REGISTRY_NAMESPACE := "wunker-bunker/wunker-os" -# export BB_REGISTRY := "harbor.jpnet.dev" -# export BB_REGISTRY_NAMESPACE := "wunker-os" +# export BB_REGISTRY := "registry.gitlab.com" +# 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" diff --git a/recipes/common/gaming.yml b/recipes/common/gaming.yml index a9ccfa3..83ab169 100644 --- a/recipes/common/gaming.yml +++ b/recipes/common/gaming.yml @@ -1,12 +1,15 @@ --- -# 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: 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 +19,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/ diff --git a/recipes/common/jp-common.yml b/recipes/common/jp-common.yml index aa2fe15..fbbcdfe 100644 --- a/recipes/common/jp-common.yml +++ b/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 diff --git a/recipes/common/jp-desktop.yml b/recipes/common/jp-desktop.yml index 8b8b5b1..1d6942f 100644 --- a/recipes/common/jp-desktop.yml +++ b/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: diff --git a/recipes/common/jp-laptop.yml b/recipes/common/jp-laptop.yml index 481dc28..6e8ac49 100644 --- a/recipes/common/jp-laptop.yml +++ b/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 diff --git a/recipes/jp-desktop-nvidia.yml b/recipes/jp-desktop-nvidia.yml index 80cdd0a..d773a24 100644 --- a/recipes/jp-desktop-nvidia.yml +++ b/recipes/jp-desktop-nvidia.yml @@ -6,9 +6,8 @@ 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 +stages: + - from-file: common/jp-desktop.yml modules: - from-file: common/jp-desktop.yml - # - from-file: common/helix.yml - from-file: common/post-build.yml diff --git a/recipes/jp-laptop.yml b/recipes/jp-laptop.yml index ce34424..8e3ef7c 100644 --- a/recipes/jp-laptop.yml +++ b/recipes/jp-laptop.yml @@ -4,9 +4,8 @@ name: jp-laptop 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: -# - from-file: common/helix.yml +stages: + - from-file: common/jp-laptop.yml modules: - from-file: common/jp-laptop.yml - # - from-file: common/helix.yml - from-file: common/post-build.yml diff --git a/recipes/pg-desktop-nvidia.yml b/recipes/pg-desktop-nvidia.yml index 7c5bde7..c35feaf 100644 --- a/recipes/pg-desktop-nvidia.yml +++ b/recipes/pg-desktop-nvidia.yml @@ -4,6 +4,8 @@ name: pg-desktop-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