Skip to content

Commit

Permalink
fix: Try to fix broken builds on Fedora 39
Browse files Browse the repository at this point in the history
  • Loading branch information
ethanjli committed Nov 7, 2023
1 parent 6bf949e commit 2701115
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ jobs:
labels: |
org.opencontainers.image.title=${{ env.IMAGE_NAME }}
org.opencontainers.image.version=${{ steps.labels.outputs.VERSION }}
org.opencontainers.image.description=An interpretation of the Ubuntu spirit built on Fedora technology
org.opencontainers.image.description=A Fedora Kinoite customization for Ethan's personal computer(s), based on Project Bluefin
io.artifacthub.package.readme-url=https://raw.githubusercontent.com/ethanjli/lutho-os/main/README.md
io.artifacthub.package.logo-url=https://avatars.githubusercontent.com/u/120078124?s=200&v=4
Expand Down
16 changes: 9 additions & 7 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,15 @@ COPY --from=ghcr.io/ublue-os/akmods:${AKMODS_FLAVOR}-${FEDORA_MAJOR_VERSION} /rp
RUN 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 \
echo "Warning: skipped due to temporary issues with the Fedora 39 release!"
# FIXME(ethanjli): re-enable this once it works again for Fedora 39
#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 \
; fi && \
# Don't install evdi on asus because of conflicts
if grep -qv "asus" <<< "${AKMODS_FLAVOR}"; then \
Expand Down

0 comments on commit 2701115

Please sign in to comment.