feat: Fedora 41 (#72)

wayblueorg · Oct 29, 2024 · ca09552 · ca09552
1 parent 03fa9eb
commit ca09552
Show file tree

Hide file tree

Showing 32 changed files with 82 additions and 47 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -65,8 +65,8 @@ jobs:
           attempt_delay: 15000
           command: |
             set -eo pipefail
-            linux=$(skopeo inspect docker://ghcr.io/ublue-os/main-kernel:40 | jq -r '.Labels["ostree.linux"]')
-            AKMODS_KERNEL_VERSION=$(skopeo inspect docker://ghcr.io/ublue-os/akmods:main-40 | jq -r '.Labels["ostree.linux"]')
+            linux=$(skopeo inspect docker://ghcr.io/ublue-os/main-kernel:41 | jq -r '.Labels["ostree.linux"]')
+            AKMODS_KERNEL_VERSION=$(skopeo inspect docker://ghcr.io/ublue-os/akmods:main-41 | jq -r '.Labels["ostree.linux"]')
             if [[ "${linux}" != "${AKMODS_KERNEL_VERSION}" ]]; then
               echo "Kernel Versions do not match between AKMODS and Cached-Kernel."
               exit 1

diff --git a/files/scripts/regenerateinitramfs.sh b/files/scripts/regenerateinitramfs.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+# Tell build process to exit if there are any errors.
+set -oue pipefail
+
+
+rpm-ostree cliwrap install-to-root /
+
+QUALIFIED_KERNEL="$(rpm -qa | grep -P 'kernel-(\d+\.\d+\.\d+)' | sed -E 's/kernel-//')"
+/usr/libexec/rpm-ostree/wrapped/dracut --no-hostonly --kver "$QUALIFIED_KERNEL" --reproducible -v --add ostree -f "/lib/modules/$QUALIFIED_KERNEL/initramfs.img"
+chmod 0600 "/lib/modules/$QUALIFIED_KERNEL/initramfs.img"
diff --git a/files/scripts/setearlyloading.sh b/files/scripts/setearlyloading.sh
@@ -3,11 +3,5 @@
 # Tell build process to exit if there are any errors.
 set -oue pipefail
 
-sed -i 's@omit_drivers@force_drivers@g' /usr/lib/dracut/dracut.conf.d/99-nvidia-dracut.conf
-sed -i 's@ nvidia @ i915 amdgpu nvidia @g' /usr/lib/dracut/dracut.conf.d/99-nvidia-dracut.conf
-
-rpm-ostree cliwrap install-to-root /
-
-QUALIFIED_KERNEL="$(rpm -qa | grep -P 'kernel-(\d+\.\d+\.\d+)' | sed -E 's/kernel-//')"
-/usr/libexec/rpm-ostree/wrapped/dracut --no-hostonly --kver "$QUALIFIED_KERNEL" --reproducible -v --add ostree -f "/lib/modules/$QUALIFIED_KERNEL/initramfs.img"
-chmod 0600 "/lib/modules/$QUALIFIED_KERNEL/initramfs.img"
+sed -i 's@omit_drivers@force_drivers@g' /usr/lib/dracut/dracut.conf.d/99-nvidia.conf
+sed -i 's@ nvidia @ i915 amdgpu nvidia @g' /usr/lib/dracut/dracut.conf.d/99-nvidia.conf
diff --git a/files/system/hyprland/usr/share/hyprland/hyprland.conf b/files/system/hyprland/usr/share/hyprland/hyprland.conf
@@ -87,7 +87,7 @@ dwindle {
 
 master {
     # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
-    new_is_master = true
+    new_status = master
 }
 
 gestures {

diff --git a/recipes/common/common-modules.yml b/recipes/common/common-modules.yml
@@ -1,16 +1,15 @@
 modules:
     - type: containerfile
       snippets:
-        - COPY --from=ghcr.io/ublue-os/akmods:main-40 /rpms /tmp/rpms
+        - COPY --from=ghcr.io/ublue-os/akmods:main-41 /rpms /tmp/rpms
         - RUN find /tmp/rpms
         - RUN rpm -q ublue-os-akmods-addons || rpm-ostree install /tmp/rpms/ublue-os/ublue-os-akmods-addons*.rpm
     - type: containerfile
       snippets:
-        - COPY --from=ghcr.io/ublue-os/main-kernel:40 /tmp/rpms /tmp/rpms/kernel
+        - COPY --from=ghcr.io/ublue-os/main-kernel:41 /tmp/rpms /tmp/rpms/kernel
     - type: script
       scripts:
         - installsignedkernel.sh
-        - removeunusedrepos.sh
 
     - type: containerfile
       snippets:

diff --git a/recipes/common/final-modules.yml b/recipes/common/final-modules.yml
@@ -0,0 +1,5 @@
+modules:
+    - type: script
+      scripts:
+        - removeunusedrepos.sh
+        - regenerateinitramfs.sh
diff --git a/recipes/common/nvidia-modules.yml b/recipes/common/nvidia-modules.yml
@@ -1,11 +1,12 @@
 modules:
   - type: containerfile
     snippets:
-      - COPY --from=ghcr.io/ublue-os/akmods-nvidia:main-40 /rpms/ /tmp/rpms
+      - COPY --from=ghcr.io/ublue-os/akmods-nvidia:main-41 /rpms/ /tmp/rpms
       - RUN find /tmp/rpms
       - RUN rpm-ostree install /tmp/rpms/ublue-os/ublue-os-nvidia*.rpm
       - RUN sed -i '0,/enabled=0/{s/enabled=0/enabled=1/}' /etc/yum.repos.d/nvidia-container-toolkit.repo
-      - RUN rpm-ostree install /tmp/rpms/kmods/kmod-nvidia*.rpm nvidia-container-toolkit xorg-x11-drv-nvidia xorg-x11-drv-nvidia-cuda nvidia-vaapi-driver
+      - RUN sed -i '0,/enabled=0/{s/enabled=0/enabled=1\npriority=90/}' /etc/yum.repos.d/negativo17-fedora-nvidia.repo   
+      - RUN rpm-ostree install /tmp/rpms/kmods/kmod-nvidia*.rpm libnvidia-fbc libva-nvidia-driver nvidia-driver nvidia-driver-cuda nvidia-modprobe nvidia-persistenced nvidia-settings nvidia-container-toolkit 
   - type: script
     scripts:
       - installnvidiatoolkitpolicy.sh

diff --git a/recipes/common/nvidia-open-modules.yml b/recipes/common/nvidia-open-modules.yml
@@ -1,14 +1,15 @@
 modules:
   - type: containerfile
     snippets:
-      - COPY --from=ghcr.io/ublue-os/akmods-nvidia-open:main-40 /rpms/ /tmp/rpms
+      - COPY --from=ghcr.io/ublue-os/akmods-nvidia-open:main-41 /rpms/ /tmp/rpms
       - RUN find /tmp/rpms
       - RUN rpm-ostree install /tmp/rpms/ublue-os/ublue-os-nvidia*.rpm
       - RUN sed -i '0,/enabled=0/{s/enabled=0/enabled=1/}' /etc/yum.repos.d/nvidia-container-toolkit.repo
-      - RUN rpm-ostree install /tmp/rpms/kmods/kmod-nvidia*.rpm nvidia-container-toolkit xorg-x11-drv-nvidia xorg-x11-drv-nvidia-cuda nvidia-vaapi-driver
+      - RUN sed -i '0,/enabled=0/{s/enabled=0/enabled=1\npriority=90/}' /etc/yum.repos.d/negativo17-fedora-nvidia.repo   
+      - RUN rpm-ostree install /tmp/rpms/kmods/kmod-nvidia*.rpm libnvidia-fbc libva-nvidia-driver nvidia-driver nvidia-driver-cuda nvidia-modprobe nvidia-persistenced nvidia-settings nvidia-container-toolkit 
   - type: script
     scripts:
       - installnvidiatoolkitpolicy.sh
       - removeunusedrepos.sh
       - setearlyloading.sh
-      - setdrmvariables.sh
+      - setdrmvariables.sh
diff --git a/recipes/recipe-hyprland-gdm.yml b/recipes/recipe-hyprland-gdm.yml
@@ -4,9 +4,10 @@ description: ublue images for wayland compositors
 
 base-image: quay.io/fedora-ostree-desktops/base
 
-image-version: 40 
+image-version: 41 
 
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/gdm-modules.yml
   - from-file: common/hyprland-modules.yml
+  - from-file: common/final-modules.yml
diff --git a/recipes/recipe-hyprland-nvidia-gdm.yml b/recipes/recipe-hyprland-nvidia-gdm.yml
@@ -4,10 +4,11 @@ description: ublue images for wayland compositors
 
 base-image: quay.io/fedora-ostree-desktops/base
 
-image-version: 40 
+image-version: 41 
 
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/nvidia-modules.yml
   - from-file: common/gdm-modules.yml
   - from-file: common/hyprland-modules.yml
+  - from-file: common/final-modules.yml
diff --git a/recipes/recipe-hyprland-nvidia-open-gdm.yml b/recipes/recipe-hyprland-nvidia-open-gdm.yml
@@ -4,10 +4,11 @@ description: ublue images for wayland compositors
 
 base-image: quay.io/fedora-ostree-desktops/base
 
-image-version: 40 
+image-version: 41 
 
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/nvidia-open-modules.yml
   - from-file: common/gdm-modules.yml
   - from-file: common/hyprland-modules.yml
+  - from-file: common/final-modules.yml
diff --git a/recipes/recipe-hyprland-nvidia-open.yml b/recipes/recipe-hyprland-nvidia-open.yml
@@ -4,10 +4,11 @@ description: ublue images for wayland compositors
 
 base-image: quay.io/fedora-ostree-desktops/base
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/sddm-modules.yml
   - from-file: common/common-modules.yml
   - from-file: common/nvidia-open-modules.yml
   - from-file: common/hyprland-modules.yml
+  - from-file: common/final-modules.yml
diff --git a/recipes/recipe-hyprland-nvidia.yml b/recipes/recipe-hyprland-nvidia.yml
@@ -4,10 +4,11 @@ description: ublue images for wayland compositors
 
 base-image: quay.io/fedora-ostree-desktops/base
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/sddm-modules.yml
   - from-file: common/common-modules.yml
   - from-file: common/nvidia-modules.yml
   - from-file: common/hyprland-modules.yml
+  - from-file: common/final-modules.yml
diff --git a/recipes/recipe-hyprland.yml b/recipes/recipe-hyprland.yml
@@ -4,9 +4,10 @@ description: ublue images for wayland compositors
 
 base-image: quay.io/fedora-ostree-desktops/base
 
-image-version: 40 
+image-version: 41 
 
 modules:
   - from-file: common/sddm-modules.yml
   - from-file: common/common-modules.yml
   - from-file: common/hyprland-modules.yml
+  - from-file: common/final-modules.yml
diff --git a/recipes/recipe-river-gdm.yml b/recipes/recipe-river-gdm.yml
@@ -4,9 +4,10 @@ description: ublue images for wayland compositors
 
 base-image: quay.io/fedora-ostree-desktops/base
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/gdm-modules.yml
   - from-file: common/river-modules.yml
+  - from-file: common/final-modules.yml
diff --git a/recipes/recipe-river-nvidia-gdm.yml b/recipes/recipe-river-nvidia-gdm.yml
@@ -4,10 +4,11 @@ description: ublue images for wayland compositors
 
 base-image: quay.io/fedora-ostree-desktops/base
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/nvidia-modules.yml
   - from-file: common/gdm-modules.yml
   - from-file: common/river-modules.yml
+  - from-file: common/final-modules.yml
diff --git a/recipes/recipe-river-nvidia-open-gdm.yml b/recipes/recipe-river-nvidia-open-gdm.yml
@@ -4,10 +4,11 @@ description: ublue images for wayland compositors
 
 base-image: quay.io/fedora-ostree-desktops/base
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/nvidia-open-modules.yml
   - from-file: common/gdm-modules.yml
   - from-file: common/river-modules.yml
+  - from-file: common/final-modules.yml
diff --git a/recipes/recipe-river-nvidia-open.yml b/recipes/recipe-river-nvidia-open.yml
@@ -4,10 +4,11 @@ description: ublue images for wayland compositors
 
 base-image: quay.io/fedora-ostree-desktops/base
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/sddm-modules.yml
   - from-file: common/common-modules.yml
   - from-file: common/nvidia-open-modules.yml
   - from-file: common/river-modules.yml
+  - from-file: common/final-modules.yml
diff --git a/recipes/recipe-river-nvidia.yml b/recipes/recipe-river-nvidia.yml
@@ -4,10 +4,11 @@ description: ublue images for wayland compositors
 
 base-image: quay.io/fedora-ostree-desktops/base
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/sddm-modules.yml
   - from-file: common/common-modules.yml
   - from-file: common/nvidia-modules.yml
   - from-file: common/river-modules.yml
+  - from-file: common/final-modules.yml
diff --git a/recipes/recipe-river.yml b/recipes/recipe-river.yml
@@ -4,9 +4,10 @@ description: ublue images for wayland compositors
 
 base-image: quay.io/fedora-ostree-desktops/base
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/sddm-modules.yml
   - from-file: common/common-modules.yml
   - from-file: common/river-modules.yml
+  - from-file: common/final-modules.yml
diff --git a/recipes/recipe-sway-gdm.yml b/recipes/recipe-sway-gdm.yml
@@ -4,10 +4,11 @@ description: ublue images for wayland compositors
 
 base-image: quay.io/fedora-ostree-desktops/sericea
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/remove-sddm.yml
   - from-file: common/common-modules.yml
   - from-file: common/gdm-modules.yml
   - from-file: common/sway-modules.yml
+  - from-file: common/final-modules.yml
diff --git a/recipes/recipe-sway-nvidia-gdm.yml b/recipes/recipe-sway-nvidia-gdm.yml
@@ -4,7 +4,7 @@ description: ublue images for wayland compositors
 
 base-image: quay.io/fedora-ostree-desktops/sericea
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/remove-sddm.yml
@@ -14,4 +14,5 @@ modules:
   - from-file: common/sway-modules.yml
   - type: script
     scripts:
-      - setswaynvidiaenvironment.sh
+      - setswaynvidiaenvironment.sh
+  - from-file: common/final-modules.yml
diff --git a/recipes/recipe-sway-nvidia-open-gdm.yml b/recipes/recipe-sway-nvidia-open-gdm.yml
@@ -4,7 +4,7 @@ description: ublue images for wayland compositors
 
 base-image: quay.io/fedora-ostree-desktops/sericea
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/remove-sddm.yml
@@ -14,4 +14,5 @@ modules:
   - from-file: common/sway-modules.yml
   - type: script
     scripts:
-      - setswaynvidiaenvironment.sh
+      - setswaynvidiaenvironment.sh
+  - from-file: common/final-modules.yml
diff --git a/recipes/recipe-sway-nvidia-open.yml b/recipes/recipe-sway-nvidia-open.yml
@@ -4,7 +4,7 @@ description: ublue images for wayland compositors
 
 base-image: quay.io/fedora-ostree-desktops/sericea
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/sddm-modules.yml
@@ -13,4 +13,5 @@ modules:
   - from-file: common/sway-modules.yml
   - type: script
     scripts:
-      - setswaynvidiaenvironment.sh
+      - setswaynvidiaenvironment.sh
+  - from-file: common/final-modules.yml
diff --git a/recipes/recipe-sway-nvidia.yml b/recipes/recipe-sway-nvidia.yml
@@ -4,7 +4,7 @@ description: ublue images for wayland compositors
 
 base-image: quay.io/fedora-ostree-desktops/sericea
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/sddm-modules.yml
@@ -13,4 +13,5 @@ modules:
   - from-file: common/sway-modules.yml
   - type: script
     scripts:
-      - setswaynvidiaenvironment.sh
+      - setswaynvidiaenvironment.sh
+  - from-file: common/final-modules.yml
diff --git a/recipes/recipe-sway.yml b/recipes/recipe-sway.yml
@@ -4,9 +4,10 @@ description: ublue images for wayland compositors
 
 base-image: quay.io/fedora-ostree-desktops/sericea
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/sddm-modules.yml
   - from-file: common/common-modules.yml
   - from-file: common/sway-modules.yml
+  - from-file: common/final-modules.yml
diff --git a/recipes/recipe-wayfire-gdm.yml b/recipes/recipe-wayfire-gdm.yml
@@ -4,10 +4,11 @@ description: ublue images for wayland compositors
 
 base-image: quay.io/fedora-ostree-desktops/base
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/gdm-modules.yml
   - from-file: common/wayfire-modules.yml
+  - from-file: common/final-modules.yml
 
diff --git a/recipes/recipe-wayfire-nvidia-gdm.yml b/recipes/recipe-wayfire-nvidia-gdm.yml
@@ -4,10 +4,11 @@ description: ublue images for wayland compositors
 
 base-image: quay.io/fedora-ostree-desktops/base
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/nvidia-modules.yml
   - from-file: common/gdm-modules.yml
   - from-file: common/wayfire-modules.yml
+  - from-file: common/final-modules.yml
diff --git a/recipes/recipe-wayfire-nvidia-open-gdm.yml b/recipes/recipe-wayfire-nvidia-open-gdm.yml
@@ -4,10 +4,11 @@ description: ublue images for wayland compositors
 
 base-image: quay.io/fedora-ostree-desktops/base
 
-image-version: 40
+image-version: 41
 
 modules:
   - from-file: common/common-modules.yml
   - from-file: common/nvidia-open-modules.yml
   - from-file: common/gdm-modules.yml
   - from-file: common/wayfire-modules.yml
+  - from-file: common/final-modules.yml