From 5421968b25599dc740edb9f000f3f0f08eabe1cf Mon Sep 17 00:00:00 2001
From: Gerald Pinder <gmpinder@gmail.com>
Date: Fri, 12 Sep 2025 16:20:25 -0400
Subject: [PATCH] Make adjustments to ujust recipes

---
 recipes/base/common.yml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/recipes/base/common.yml b/recipes/base/common.yml
index b5d9c5c..01fc339 100644
--- a/recipes/base/common.yml
+++ b/recipes/base/common.yml
@@ -20,6 +20,7 @@ modules:
         - ublue-os/packages
         - ublue-os/staging
     install:
+      install-weak-deps: false
       packages:
         - bootc
         - ublue-os-just
@@ -90,6 +91,7 @@ modules:
         - intel-gmmlib
         - libva-intel-media-driver
     remove:
+      auto-remove: false
       packages:
         - fedora-flathub-remote
         - fedora-third-party
@@ -97,12 +99,14 @@ modules:
       # 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
       - from-repo: fedora
+        install-weak-deps: false
         packages:
           - new: ocl-icd
             old: OpenCL-ICD-Loader
 
       # use override to replace mesa and others with less crippled versions
       - from-repo: fedora-multimedia
+        install-weak-deps: false
         packages:
           - libva
           - intel-vpl-gpu-rt
@@ -120,9 +124,17 @@ modules:
     env:
       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
-      - systemctl set-default graphical.target
+
       # use CoreOS' generator for emergency/rescue boot
       # see detail: https://github.com/ublue-os/main/issues/653
       - curl -sSLo ${CSFG} https://raw.githubusercontent.com/coreos/fedora-coreos-config/refs/heads/stable/overlay.d/05core/usr/lib/systemd/system-generators/coreos-sulogin-force-generator
       - 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