anders/my-ostree-OS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

changed kernel to LTS and added variables for whcih kernel package is being used so it can be easily changed.

Browse source
This commit is contained in:
Anders Rytter Hansen 2025-01-28 10:13:30 +01:00
commit 4add346dea
4 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Dockerfile
View file

@ -1,5 +1,8 @@
FROM fedora:41 AS akmods-builder
ARG KERNEL=kernel-cachyos-lts-lto
ENV KERNEL=${KERNEL}
# Get list of kernels from CachyOS LTO repo. If the list has been updated, then akmods will be rebuilt. If it hasn't been updated, then caching of the previous build will be used.
ADD "https://copr.fedorainfracloud.org/api_3/build/list?ownername=bieszczaders&projectname=kernel-cachyos-lto&packagename=kernel-cachyos-lto" /tmp/builds.txt
@ -16,11 +19,11 @@ wget https://copr.fedorainfracloud.org/coprs/andersrh/kernel-cachyos/repo/fedora
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-lto kernel-cachyos-lto-devel kernel-cachyos-lto-modules kernel-cachyos-lto-core kernel-cachyos-lto-devel-matched
RUN dnf -y install ${KERNEL} ${KERNEL}-devel ${KERNEL}-modules ${KERNEL}-core ${KERNEL}-devel-matched
RUN dnf -y install akmod-nvidia akmod-VirtualBox
COPY akmods.sh /tmp/akmods.sh
RUN /tmp/akmods.sh
RUN /tmp/akmods.sh ${KERNEL}
FROM quay.io/fedora-ostree-desktops/kinoite:41 AS base
@ -51,6 +54,9 @@ RUN rpm-ostree install ffmpeg ffmpeg-libs libavdevice intel-media-driver pipewir
FROM base AS kernel
ARG KERNEL=kernel-cachyos-lts-lto
ENV KERNEL=${KERNEL}
RUN mkdir /tmp/nvidia
COPY install-nvidia.sh /tmp/install-nvidia.sh
@ -71,10 +77,10 @@ COPY install_cachyos_kernel.sh /tmp
# Enable cliwrap.
RUN rpm-ostree cliwrap install-to-root / && \
# Replace the kernel, kernel-core and kernel-modules packages.
/tmp/install_cachyos_kernel.sh
/tmp/install_cachyos_kernel.sh ${KERNEL}
# install akmods
RUN ls /tmp/nvidia && /tmp/install-nvidia.sh
RUN ls /tmp/nvidia && /tmp/install-nvidia.sh ${KERNEL}
RUN rpm-ostree install \
xorg-x11-drv-nvidia{,-cuda,-devel,-kmodsrc} \
@ -134,10 +140,10 @@ RUN rpm-ostree install virt-manager libvirt-daemon-driver-lxc libvirt-daemon-lxc
RUN rpm-ostree install vdo bees
# Install ZFS
RUN rpm -e --nodeps zfs-fuse && rpm-ostree install https://zfsonlinux.org/fedora/zfs-release-2-6$(rpm --eval "%{dist}").noarch.rpm && rpm-ostree install kernel-cachyos-lto-devel kernel-cachyos-lto-devel-matched && rpm-ostree install zfs --uninstall zfs-fuse
RUN rpm -e --nodeps zfs-fuse && rpm-ostree install https://zfsonlinux.org/fedora/zfs-release-2-6$(rpm --eval "%{dist}").noarch.rpm && rpm-ostree install ${KERNEL}-devel ${KERNEL}-devel-matched && rpm-ostree install zfs --uninstall zfs-fuse
# Build ZFS module manually
RUN dkms install zfs/$(ls /usr/src/ | grep zfs- | cut -d- -f2-) -k $(rpm -q --queryformat "%{VERSION}-%{RELEASE}.%{ARCH}\n" kernel-cachyos-lto)
RUN dkms install zfs/$(ls /usr/src/ | grep zfs- | cut -d- -f2-) -k $(rpm -q --queryformat "%{VERSION}-%{RELEASE}.%{ARCH}\n" ${KERNEL})
# enable scx service
RUN systemctl enable scx.service

4
akmods.sh
View file

@ -1,5 +1,7 @@
#!/bin/sh
KERNEL_VERSION="$(rpm -q kernel-cachyos-lto --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
KERNEL=$1
KERNEL_VERSION="$(rpm -q $KERNEL --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
akmods --force --kernels "${KERNEL_VERSION}"

2
install-nvidia.sh
View file

@ -1,5 +1,5 @@
#!/bin/sh
KERNEL_VERSION="$(rpm -q kernel-cachyos-lto --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
KERNEL_VERSION="$(rpm -q $1 --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
rpm-ostree install /tmp/nvidia/*${KERNEL_VERSION}*.rpm

2
install_cachyos_kernel.sh
View file

@ -1,3 +1,3 @@
#!/bin/bash
rpm-ostree override remove kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra --install kernel-cachyos-lto
rpm-ostree override remove kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra --install $1