From 62a2cf991713b216ef0207f19de2e98ac2b85b42 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Wed, 17 Apr 2024 23:18:13 -0700 Subject: [PATCH] chore: Restore akmods, but for akmods-main --- Containerfile | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Containerfile b/Containerfile index 7193bcda..10d2b4a0 100644 --- a/Containerfile +++ b/Containerfile @@ -99,22 +99,22 @@ RUN mkdir -p /tmp/linux-firmware-neptune && \ # Add ublue packages, add needed negativo17 repo and then immediately disable due to incompatibility with RPMFusion #COPY --from=ghcr.io/ublue-os/akmods:${AKMODS_FLAVOR}-${FEDORA_MAJOR_VERSION} /rpms /tmp/akmods-rpms -#RUN sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \ -# curl -Lo /etc/yum.repos.d/negativo17-fedora-multimedia.repo https://negativo17.org/repos/fedora-multimedia.repo && \ -# rpm-ostree install \ -# /tmp/akmods-rpms/kmods/*xone*.rpm \ -# /tmp/akmods-rpms/kmods/*openrazer*.rpm \ -# /tmp/akmods-rpms/kmods/*wl*.rpm \ -# /tmp/akmods-rpms/kmods/*gcadapter_oc*.rpm \ -# /tmp/akmods-rpms/kmods/*nct6687*.rpm \ -# /tmp/akmods-rpms/kmods/*evdi*.rpm \ -# /tmp/akmods-rpms/kmods/*zenergy*.rpm \ -# /tmp/akmods-rpms/kmods/*ayaneo-platform*.rpm \ -# /tmp/akmods-rpms/kmods/*ayn-platform*.rpm \ -# /tmp/akmods-rpms/kmods/*rtl8814au*.rpm \ -# /tmp/akmods-rpms/kmods/*ryzen-smu*.rpm && \ -# sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \ -# ostree container commit +COPY --from=ghcr.io/ublue-os/akmods:main-${FEDORA_MAJOR_VERSION} /rpms /tmp/akmods-rpms +RUN sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \ + curl -Lo /etc/yum.repos.d/negativo17-fedora-multimedia.repo https://negativo17.org/repos/fedora-multimedia.repo && \ + rpm-ostree install \ + /tmp/akmods-rpms/kmods/*xone*.rpm \ + /tmp/akmods-rpms/kmods/*openrazer*.rpm \ + /tmp/akmods-rpms/kmods/*wl*.rpm \ + /tmp/akmods-rpms/kmods/*gcadapter_oc*.rpm \ + /tmp/akmods-rpms/kmods/*nct6687*.rpm \ + /tmp/akmods-rpms/kmods/*evdi*.rpm \ + /tmp/akmods-rpms/kmods/*zenergy*.rpm \ + /tmp/akmods-rpms/kmods/*ayaneo-platform*.rpm \ + /tmp/akmods-rpms/kmods/*ayn-platform*.rpm \ + /tmp/akmods-rpms/kmods/*ryzen-smu*.rpm && \ + sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \ + ostree container commit # Update packages that commonly cause build issues RUN rpm-ostree override replace \