diff --git a/Containerfile b/Containerfile index 694eb75..6a20b3a 100644 --- a/Containerfile +++ b/Containerfile @@ -2,8 +2,13 @@ ARG FEDORA_MAJOR_VERSION=40 FROM quay.io/fedora-ostree-desktops/kinoite:${FEDORA_MAJOR_VERSION} +ARG FEDORA_MAJOR_VERSION + COPY scripts /tmp/scripts +# https://github.com/ublue-os/akmods#kmod-packages +COPY --from=ghcr.io/ublue-os/akmods-nvidia-open:main-${FEDORA_MAJOR_VERSION} /rpms/ /tmp/rpms + RUN mkdir -p /var/lib/alternatives && \ /tmp/scripts/build.sh && \ ostree container commit diff --git a/scripts/nvidia/install.sh b/scripts/nvidia/install.sh index 19113cd..004c843 100755 --- a/scripts/nvidia/install.sh +++ b/scripts/nvidia/install.sh @@ -7,10 +7,9 @@ set -ouex pipefail rpm-ostree install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$RELEASE.noarch.rpm \ https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$RELEASE.noarch.rpm -# See https://rpmfusion.org/Howto/NVIDIA#OSTree_.28Silverblue.2FKinoite.2Fetc.29 -curl -o /etc/yum.repos.d/kwizart-nvidia-driver-rawhide-fedora.repo https://copr.fedorainfracloud.org/coprs/kwizart/nvidia-driver-rawhide/repo/fedora-$RELEASE/kwizart-nvidia-driver-rawhide-fedora-$RELEASE.repo - -rpm-ostree install akmod-nvidia-default-open akmod-nvidia xorg-x11-drv-nvidia-cuda libva-nvidia-driver \ +rpm-ostree install /tmp/rpms/ublue-os/ublue-os-nvidia*.rpm +rpm-ostree install /tmp/rpms/kmods/kmod-nvidia*.rpm +rpm-ostree install xorg-x11-drv-nvidia-cuda libva-nvidia-driver \ nvidia-vaapi-driver libva-utils vdpauinfo cp /tmp/scripts/nvidia/modprobe.d/*.conf /etc/modprobe.d/ \ No newline at end of file