Skip to content

Commit ca09552

Browse files
RoyalOughtnessRoyalOughtness
authored
feat: Fedora 41 (#72)
1 parent 03fa9eb commit ca09552

32 files changed

+82
-47
lines changed

‎.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ jobs:
6565
attempt_delay: 15000
6666
command: |
6767
set -eo pipefail
68-
linux=$(skopeo inspect docker://ghcr.io/ublue-os/main-kernel:40 | jq -r '.Labels["ostree.linux"]')
69-
AKMODS_KERNEL_VERSION=$(skopeo inspect docker://ghcr.io/ublue-os/akmods:main-40 | jq -r '.Labels["ostree.linux"]')
68+
linux=$(skopeo inspect docker://ghcr.io/ublue-os/main-kernel:41 | jq -r '.Labels["ostree.linux"]')
69+
AKMODS_KERNEL_VERSION=$(skopeo inspect docker://ghcr.io/ublue-os/akmods:main-41 | jq -r '.Labels["ostree.linux"]')
7070
if [[ "${linux}" != "${AKMODS_KERNEL_VERSION}" ]]; then
7171
echo "Kernel Versions do not match between AKMODS and Cached-Kernel."
7272
exit 1

‎files/scripts/regenerateinitramfs.sh

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/usr/bin/env bash
2+
3+
# Tell build process to exit if there are any errors.
4+
set -oue pipefail
5+
6+
7+
rpm-ostree cliwrap install-to-root /
8+
9+
QUALIFIED_KERNEL="$(rpm -qa | grep -P 'kernel-(\d+\.\d+\.\d+)' | sed -E 's/kernel-//')"
10+
/usr/libexec/rpm-ostree/wrapped/dracut --no-hostonly --kver "$QUALIFIED_KERNEL" --reproducible -v --add ostree -f "/lib/modules/$QUALIFIED_KERNEL/initramfs.img"
11+
chmod 0600 "/lib/modules/$QUALIFIED_KERNEL/initramfs.img"

‎files/scripts/setearlyloading.sh

+2-8
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,5 @@
33
# Tell build process to exit if there are any errors.
44
set -oue pipefail
55

6-
sed -i 's@omit_drivers@force_drivers@g' /usr/lib/dracut/dracut.conf.d/99-nvidia-dracut.conf
7-
sed -i 's@ nvidia @ i915 amdgpu nvidia @g' /usr/lib/dracut/dracut.conf.d/99-nvidia-dracut.conf
8-
9-
rpm-ostree cliwrap install-to-root /
10-
11-
QUALIFIED_KERNEL="$(rpm -qa | grep -P 'kernel-(\d+\.\d+\.\d+)' | sed -E 's/kernel-//')"
12-
/usr/libexec/rpm-ostree/wrapped/dracut --no-hostonly --kver "$QUALIFIED_KERNEL" --reproducible -v --add ostree -f "/lib/modules/$QUALIFIED_KERNEL/initramfs.img"
13-
chmod 0600 "/lib/modules/$QUALIFIED_KERNEL/initramfs.img"
6+
sed -i 's@omit_drivers@force_drivers@g' /usr/lib/dracut/dracut.conf.d/99-nvidia.conf
7+
sed -i 's@ nvidia @ i915 amdgpu nvidia @g' /usr/lib/dracut/dracut.conf.d/99-nvidia.conf

‎files/system/hyprland/usr/share/hyprland/hyprland.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ dwindle {
8787

8888
master {
8989
# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
90-
new_is_master = true
90+
new_status = master
9191
}
9292

9393
gestures {

‎recipes/common/common-modules.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
modules:
22
- type: containerfile
33
snippets:
4-
- COPY --from=ghcr.io/ublue-os/akmods:main-40 /rpms /tmp/rpms
4+
- COPY --from=ghcr.io/ublue-os/akmods:main-41 /rpms /tmp/rpms
55
- RUN find /tmp/rpms
66
- RUN rpm -q ublue-os-akmods-addons || rpm-ostree install /tmp/rpms/ublue-os/ublue-os-akmods-addons*.rpm
77
- type: containerfile
88
snippets:
9-
- COPY --from=ghcr.io/ublue-os/main-kernel:40 /tmp/rpms /tmp/rpms/kernel
9+
- COPY --from=ghcr.io/ublue-os/main-kernel:41 /tmp/rpms /tmp/rpms/kernel
1010
- type: script
1111
scripts:
1212
- installsignedkernel.sh
13-
- removeunusedrepos.sh
1413

1514
- type: containerfile
1615
snippets:

‎recipes/common/final-modules.yml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
modules:
2+
- type: script
3+
scripts:
4+
- removeunusedrepos.sh
5+
- regenerateinitramfs.sh

‎recipes/common/nvidia-modules.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
modules:
22
- type: containerfile
33
snippets:
4-
- COPY --from=ghcr.io/ublue-os/akmods-nvidia:main-40 /rpms/ /tmp/rpms
4+
- COPY --from=ghcr.io/ublue-os/akmods-nvidia:main-41 /rpms/ /tmp/rpms
55
- RUN find /tmp/rpms
66
- RUN rpm-ostree install /tmp/rpms/ublue-os/ublue-os-nvidia*.rpm
77
- RUN sed -i '0,/enabled=0/{s/enabled=0/enabled=1/}' /etc/yum.repos.d/nvidia-container-toolkit.repo
8-
- 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
8+
- RUN sed -i '0,/enabled=0/{s/enabled=0/enabled=1\npriority=90/}' /etc/yum.repos.d/negativo17-fedora-nvidia.repo
9+
- 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
910
- type: script
1011
scripts:
1112
- installnvidiatoolkitpolicy.sh

‎recipes/common/nvidia-open-modules.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
modules:
22
- type: containerfile
33
snippets:
4-
- COPY --from=ghcr.io/ublue-os/akmods-nvidia-open:main-40 /rpms/ /tmp/rpms
4+
- COPY --from=ghcr.io/ublue-os/akmods-nvidia-open:main-41 /rpms/ /tmp/rpms
55
- RUN find /tmp/rpms
66
- RUN rpm-ostree install /tmp/rpms/ublue-os/ublue-os-nvidia*.rpm
77
- RUN sed -i '0,/enabled=0/{s/enabled=0/enabled=1/}' /etc/yum.repos.d/nvidia-container-toolkit.repo
8-
- 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
8+
- RUN sed -i '0,/enabled=0/{s/enabled=0/enabled=1\npriority=90/}' /etc/yum.repos.d/negativo17-fedora-nvidia.repo
9+
- 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
910
- type: script
1011
scripts:
1112
- installnvidiatoolkitpolicy.sh
1213
- removeunusedrepos.sh
1314
- setearlyloading.sh
14-
- setdrmvariables.sh
15+
- setdrmvariables.sh

‎recipes/recipe-hyprland-gdm.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ description: ublue images for wayland compositors
44

55
base-image: quay.io/fedora-ostree-desktops/base
66

7-
image-version: 40
7+
image-version: 41
88

99
modules:
1010
- from-file: common/common-modules.yml
1111
- from-file: common/gdm-modules.yml
1212
- from-file: common/hyprland-modules.yml
13+
- from-file: common/final-modules.yml

‎recipes/recipe-hyprland-nvidia-gdm.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ description: ublue images for wayland compositors
44

55
base-image: quay.io/fedora-ostree-desktops/base
66

7-
image-version: 40
7+
image-version: 41
88

99
modules:
1010
- from-file: common/common-modules.yml
1111
- from-file: common/nvidia-modules.yml
1212
- from-file: common/gdm-modules.yml
1313
- from-file: common/hyprland-modules.yml
14+
- from-file: common/final-modules.yml

‎recipes/recipe-hyprland-nvidia-open-gdm.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ description: ublue images for wayland compositors
44

55
base-image: quay.io/fedora-ostree-desktops/base
66

7-
image-version: 40
7+
image-version: 41
88

99
modules:
1010
- from-file: common/common-modules.yml
1111
- from-file: common/nvidia-open-modules.yml
1212
- from-file: common/gdm-modules.yml
1313
- from-file: common/hyprland-modules.yml
14+
- from-file: common/final-modules.yml

‎recipes/recipe-hyprland-nvidia-open.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ description: ublue images for wayland compositors
44

55
base-image: quay.io/fedora-ostree-desktops/base
66

7-
image-version: 40
7+
image-version: 41
88

99
modules:
1010
- from-file: common/sddm-modules.yml
1111
- from-file: common/common-modules.yml
1212
- from-file: common/nvidia-open-modules.yml
1313
- from-file: common/hyprland-modules.yml
14+
- from-file: common/final-modules.yml

‎recipes/recipe-hyprland-nvidia.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ description: ublue images for wayland compositors
44

55
base-image: quay.io/fedora-ostree-desktops/base
66

7-
image-version: 40
7+
image-version: 41
88

99
modules:
1010
- from-file: common/sddm-modules.yml
1111
- from-file: common/common-modules.yml
1212
- from-file: common/nvidia-modules.yml
1313
- from-file: common/hyprland-modules.yml
14+
- from-file: common/final-modules.yml

‎recipes/recipe-hyprland.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ description: ublue images for wayland compositors
44

55
base-image: quay.io/fedora-ostree-desktops/base
66

7-
image-version: 40
7+
image-version: 41
88

99
modules:
1010
- from-file: common/sddm-modules.yml
1111
- from-file: common/common-modules.yml
1212
- from-file: common/hyprland-modules.yml
13+
- from-file: common/final-modules.yml

‎recipes/recipe-river-gdm.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ description: ublue images for wayland compositors
44

55
base-image: quay.io/fedora-ostree-desktops/base
66

7-
image-version: 40
7+
image-version: 41
88

99
modules:
1010
- from-file: common/common-modules.yml
1111
- from-file: common/gdm-modules.yml
1212
- from-file: common/river-modules.yml
13+
- from-file: common/final-modules.yml

‎recipes/recipe-river-nvidia-gdm.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ description: ublue images for wayland compositors
44

55
base-image: quay.io/fedora-ostree-desktops/base
66

7-
image-version: 40
7+
image-version: 41
88

99
modules:
1010
- from-file: common/common-modules.yml
1111
- from-file: common/nvidia-modules.yml
1212
- from-file: common/gdm-modules.yml
1313
- from-file: common/river-modules.yml
14+
- from-file: common/final-modules.yml

‎recipes/recipe-river-nvidia-open-gdm.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ description: ublue images for wayland compositors
44

55
base-image: quay.io/fedora-ostree-desktops/base
66

7-
image-version: 40
7+
image-version: 41
88

99
modules:
1010
- from-file: common/common-modules.yml
1111
- from-file: common/nvidia-open-modules.yml
1212
- from-file: common/gdm-modules.yml
1313
- from-file: common/river-modules.yml
14+
- from-file: common/final-modules.yml

‎recipes/recipe-river-nvidia-open.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ description: ublue images for wayland compositors
44

55
base-image: quay.io/fedora-ostree-desktops/base
66

7-
image-version: 40
7+
image-version: 41
88

99
modules:
1010
- from-file: common/sddm-modules.yml
1111
- from-file: common/common-modules.yml
1212
- from-file: common/nvidia-open-modules.yml
1313
- from-file: common/river-modules.yml
14+
- from-file: common/final-modules.yml

‎recipes/recipe-river-nvidia.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ description: ublue images for wayland compositors
44

55
base-image: quay.io/fedora-ostree-desktops/base
66

7-
image-version: 40
7+
image-version: 41
88

99
modules:
1010
- from-file: common/sddm-modules.yml
1111
- from-file: common/common-modules.yml
1212
- from-file: common/nvidia-modules.yml
1313
- from-file: common/river-modules.yml
14+
- from-file: common/final-modules.yml

‎recipes/recipe-river.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ description: ublue images for wayland compositors
44

55
base-image: quay.io/fedora-ostree-desktops/base
66

7-
image-version: 40
7+
image-version: 41
88

99
modules:
1010
- from-file: common/sddm-modules.yml
1111
- from-file: common/common-modules.yml
1212
- from-file: common/river-modules.yml
13+
- from-file: common/final-modules.yml

‎recipes/recipe-sway-gdm.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ description: ublue images for wayland compositors
44

55
base-image: quay.io/fedora-ostree-desktops/sericea
66

7-
image-version: 40
7+
image-version: 41
88

99
modules:
1010
- from-file: common/remove-sddm.yml
1111
- from-file: common/common-modules.yml
1212
- from-file: common/gdm-modules.yml
1313
- from-file: common/sway-modules.yml
14+
- from-file: common/final-modules.yml

‎recipes/recipe-sway-nvidia-gdm.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: ublue images for wayland compositors
44

55
base-image: quay.io/fedora-ostree-desktops/sericea
66

7-
image-version: 40
7+
image-version: 41
88

99
modules:
1010
- from-file: common/remove-sddm.yml
@@ -14,4 +14,5 @@ modules:
1414
- from-file: common/sway-modules.yml
1515
- type: script
1616
scripts:
17-
- setswaynvidiaenvironment.sh
17+
- setswaynvidiaenvironment.sh
18+
- from-file: common/final-modules.yml

‎recipes/recipe-sway-nvidia-open-gdm.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: ublue images for wayland compositors
44

55
base-image: quay.io/fedora-ostree-desktops/sericea
66

7-
image-version: 40
7+
image-version: 41
88

99
modules:
1010
- from-file: common/remove-sddm.yml
@@ -14,4 +14,5 @@ modules:
1414
- from-file: common/sway-modules.yml
1515
- type: script
1616
scripts:
17-
- setswaynvidiaenvironment.sh
17+
- setswaynvidiaenvironment.sh
18+
- from-file: common/final-modules.yml

‎recipes/recipe-sway-nvidia-open.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: ublue images for wayland compositors
44

55
base-image: quay.io/fedora-ostree-desktops/sericea
66

7-
image-version: 40
7+
image-version: 41
88

99
modules:
1010
- from-file: common/sddm-modules.yml
@@ -13,4 +13,5 @@ modules:
1313
- from-file: common/sway-modules.yml
1414
- type: script
1515
scripts:
16-
- setswaynvidiaenvironment.sh
16+
- setswaynvidiaenvironment.sh
17+
- from-file: common/final-modules.yml

‎recipes/recipe-sway-nvidia.yml

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: ublue images for wayland compositors
44

55
base-image: quay.io/fedora-ostree-desktops/sericea
66

7-
image-version: 40
7+
image-version: 41
88

99
modules:
1010
- from-file: common/sddm-modules.yml
@@ -13,4 +13,5 @@ modules:
1313
- from-file: common/sway-modules.yml
1414
- type: script
1515
scripts:
16-
- setswaynvidiaenvironment.sh
16+
- setswaynvidiaenvironment.sh
17+
- from-file: common/final-modules.yml

‎recipes/recipe-sway.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ description: ublue images for wayland compositors
44

55
base-image: quay.io/fedora-ostree-desktops/sericea
66

7-
image-version: 40
7+
image-version: 41
88

99
modules:
1010
- from-file: common/sddm-modules.yml
1111
- from-file: common/common-modules.yml
1212
- from-file: common/sway-modules.yml
13+
- from-file: common/final-modules.yml

‎recipes/recipe-wayfire-gdm.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ description: ublue images for wayland compositors
44

55
base-image: quay.io/fedora-ostree-desktops/base
66

7-
image-version: 40
7+
image-version: 41
88

99
modules:
1010
- from-file: common/common-modules.yml
1111
- from-file: common/gdm-modules.yml
1212
- from-file: common/wayfire-modules.yml
13+
- from-file: common/final-modules.yml
1314

‎recipes/recipe-wayfire-nvidia-gdm.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ description: ublue images for wayland compositors
44

55
base-image: quay.io/fedora-ostree-desktops/base
66

7-
image-version: 40
7+
image-version: 41
88

99
modules:
1010
- from-file: common/common-modules.yml
1111
- from-file: common/nvidia-modules.yml
1212
- from-file: common/gdm-modules.yml
1313
- from-file: common/wayfire-modules.yml
14+
- from-file: common/final-modules.yml

‎recipes/recipe-wayfire-nvidia-open-gdm.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ description: ublue images for wayland compositors
44

55
base-image: quay.io/fedora-ostree-desktops/base
66

7-
image-version: 40
7+
image-version: 41
88

99
modules:
1010
- from-file: common/common-modules.yml
1111
- from-file: common/nvidia-open-modules.yml
1212
- from-file: common/gdm-modules.yml
1313
- from-file: common/wayfire-modules.yml
14+
- from-file: common/final-modules.yml

0 commit comments

Comments
 (0)