From 5f446c09d772212578df48bd6d180653a853d28e Mon Sep 17 00:00:00 2001 From: RJ Trujillo Date: Thu, 12 Oct 2023 12:42:32 -0600 Subject: [PATCH] chore(f39): Restore kmods removed from main This restores kmods removed from Fedora 39 --- Containerfile | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Containerfile b/Containerfile index 89de26e4e7a..5b4c9a16493 100644 --- a/Containerfile +++ b/Containerfile @@ -24,6 +24,28 @@ COPY image-info.sh /tmp/image-info.sh # Copy ublue-update.toml to tmp first, to avoid being overwritten. COPY usr/etc/ublue-update/ublue-update.toml /tmp/ublue-update.toml +# Add ublue kmods, add needed negativo17 repo and then immediately disable due to incompatibility with RPMFusion +COPY --from=ghcr.io/ublue-os/akmods:main-${FEDORA_MAJOR_VERSION} /rpms /tmp/akmods-rpms +RUN if [[ "${IMAGE_FLAVOR}" = "main" || "${IMAGE_NAME}" = "nvidia" ]]; then \ + sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \ + wget https://negativo17.org/repos/fedora-multimedia.repo -O /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \ + if [[ "${FEDORA_MAJOR_VERSION}" -ge "39" ]]; then \ + rpm-ostree install \ + /tmp/akmods-rpms/kmods/*xpadneo*.rpm \ + /tmp/akmods-rpms/kmods/*xpad-noone*.rpm \ + /tmp/akmods-rpms/kmods/*xone*.rpm \ + /tmp/akmods-rpms/kmods/*openrazer*.rpm \ + /tmp/akmods-rpms/kmods/*v4l2loopback*.rpm \ + /tmp/akmods-rpms/kmods/*wl*.rpm \ + ; else \ + rpm-ostree install \ + /tmp/akmods-rpms/kmods/*evdi*.rpm \ + ; fi && \ + sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \ + mkdir -p /etc/akmods-rpms/ && \ + mv /tmp/akmods-rpms/kmods/*steamdeck*.rpm /etc/akmods-rpms/steamdeck.rpm \ +; fi + # GNOME VRR RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/repo/fedora-"${FEDORA_MAJOR_VERSION}"/kylegospo-gnome-vrr-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo && \ if [ ${FEDORA_MAJOR_VERSION} -lt 39 ]; then \