From d8a22a1d01734091877b3fd1c0f6c3883cc580e6 Mon Sep 17 00:00:00 2001 From: Anders Rytter Hansen Date: Thu, 2 Nov 2023 08:43:56 +0100 Subject: [PATCH] new kernel package name --- akmods.sh | 2 +- install-nvidia.sh | 2 +- kernel-akmods.Dockerfile | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/akmods.sh b/akmods.sh index 16bbb90..fc6cf83 100755 --- a/akmods.sh +++ b/akmods.sh @@ -1,5 +1,5 @@ #!/bin/sh -KERNEL_VERSION="$(rpm -q kernel-cachyos-bore-eevdf --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')" +KERNEL_VERSION="$(rpm -q kernel-cachyos --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')" akmods --force --kernels "${KERNEL_VERSION}" diff --git a/install-nvidia.sh b/install-nvidia.sh index 8c85584..d142ffe 100755 --- a/install-nvidia.sh +++ b/install-nvidia.sh @@ -1,5 +1,5 @@ #!/bin/sh -KERNEL_VERSION="$(rpm -q kernel-cachyos-bore-eevdf --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')" +KERNEL_VERSION="$(rpm -q kernel-cachyos --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')" rpm-ostree install /tmp/nvidia/*${KERNEL_VERSION}*.rpm diff --git a/kernel-akmods.Dockerfile b/kernel-akmods.Dockerfile index c7b1604..f1fd1ef 100644 --- a/kernel-akmods.Dockerfile +++ b/kernel-akmods.Dockerfile @@ -16,7 +16,7 @@ RUN cd /etc/yum.repos.d/ && \ wget https://copr.fedorainfracloud.org/coprs/bieszczaders/kernel-cachyos/repo/fedora-$(rpm -E %fedora)/bieszczaders-kernel-cachyos-fedora-$(rpm -E %fedora).repo && \ wget https://copr.fedorainfracloud.org/coprs/bieszczaders/kernel-cachyos-addons/repo/fedora-$(rpm -E %fedora)/bieszczaders-kernel-cachyos-addons-fedora-$(rpm -E %fedora).repo && cd /tmp -RUN dnf -y install kernel-cachyos-bore-eevdf kernel-cachyos-bore-eevdf-headers kernel-cachyos-bore-eevdf-devel kernel-cachyos-bore-eevdf-modules kernel-cachyos-bore-eevdf-core kernel-cachyos-bore-eevdf-devel-matched +RUN dnf -y install kernel-cachyos kernel-cachyos-headers kernel-cachyos-devel kernel-cachyos-modules kernel-cachyos-core kernel-cachyos-devel-matched RUN dnf -y install akmod-nvidia akmod-VirtualBox COPY akmods.sh /tmp/akmods.sh @@ -56,10 +56,10 @@ wget https://copr.fedorainfracloud.org/coprs/bieszczaders/kernel-cachyos/repo/fe # Enable cliwrap. RUN rpm-ostree cliwrap install-to-root / && \ # Replace the kernel, kernel-core and kernel-modules packages. -rpm-ostree override remove kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra --install kernel-cachyos-bore-eevdf +rpm-ostree override remove kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra --install kernel-cachyos # install kernel headers -RUN rpm-ostree override remove kernel-headers --install kernel-cachyos-bore-eevdf-headers +RUN rpm-ostree override remove kernel-headers --install kernel-cachyos-headers # install akmods RUN ls /tmp/nvidia && /tmp/install-nvidia.sh