From 5c9cd05b882cb90a4a441e06acdcb155c07a4f1c Mon Sep 17 00:00:00 2001 From: bobslept <38557801+bobslept@users.noreply.github.com> Date: Sat, 4 Nov 2023 21:51:51 +0100 Subject: [PATCH 1/3] fix: exclude evdi on asus --- Containerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Containerfile b/Containerfile index c0b3ab80e65..babd39cf883 100644 --- a/Containerfile +++ b/Containerfile @@ -48,8 +48,10 @@ RUN sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo /tmp/akmods-rpms/kmods/*v4l2loopback*.rpm \ /tmp/akmods-rpms/kmods/*wl*.rpm \ ; fi && \ - rpm-ostree install \ - /tmp/akmods-rpms/kmods/*evdi*.rpm && \ + if grep -qv "asus" <<< "${AKMODS_FLAVOR}"; then \ + 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 # Starship Shell Prompt From 5842f66af3235c3189dbaf333daeeb61335b9f23 Mon Sep 17 00:00:00 2001 From: bobslept <38557801+bobslept@users.noreply.github.com> Date: Sat, 4 Nov 2023 21:58:11 +0100 Subject: [PATCH 2/3] chore: add comment --- Containerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Containerfile b/Containerfile index babd39cf883..e57ddc7f241 100644 --- a/Containerfile +++ b/Containerfile @@ -48,6 +48,7 @@ RUN sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo /tmp/akmods-rpms/kmods/*v4l2loopback*.rpm \ /tmp/akmods-rpms/kmods/*wl*.rpm \ ; fi && \ + # Don't install evdi on asus because of conflicts if grep -qv "asus" <<< "${AKMODS_FLAVOR}"; then \ rpm-ostree install \ /tmp/akmods-rpms/kmods/*evdi*.rpm && \ From 5fee9398bfcadf08c2a9e942c2abdca3992ee049 Mon Sep 17 00:00:00 2001 From: bobslept <38557801+bobslept@users.noreply.github.com> Date: Sat, 4 Nov 2023 22:05:27 +0100 Subject: [PATCH 3/3] chore: fix typo --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index e57ddc7f241..f0aa0517ab8 100644 --- a/Containerfile +++ b/Containerfile @@ -51,7 +51,7 @@ RUN sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo # Don't install evdi on asus because of conflicts if grep -qv "asus" <<< "${AKMODS_FLAVOR}"; then \ rpm-ostree install \ - /tmp/akmods-rpms/kmods/*evdi*.rpm && \ + /tmp/akmods-rpms/kmods/*evdi*.rpm \ ; fi && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo