Skip to content

Commit

Permalink
feat: enable builds with Fedora 39 (#50)
Browse files Browse the repository at this point in the history
Co-authored-by: RJ Trujillo <[email protected]>
Co-authored-by: RJ Trujillo <[email protected]>
  • Loading branch information
3 people authored Sep 19, 2023
1 parent d8204c4 commit 37628a2
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
fail-fast: false
matrix:
cfile_suffix: [common, nvidia]
major_version: [37, 38]
major_version: [37, 38, 39]
nvidia_version: [0, 470, 535]
exclude:
- cfile_suffix: common
Expand Down
12 changes: 8 additions & 4 deletions Containerfile.common
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ RUN /tmp/build-prep.sh

RUN /tmp/build-ublue-os-akmods-addons.sh

RUN /tmp/build-kmod-evdi.sh
RUN /tmp/build-kmod-gasket.sh
RUN /tmp/build-kmod-gcadapter_oc.sh
RUN /tmp/build-kmod-nct6687d.sh
Expand All @@ -36,9 +35,14 @@ RUN /tmp/build-kmod-ryzen-smu.sh
RUN /tmp/build-kmod-steamdeck.sh
RUN /tmp/build-kmod-v4l2loopback.sh
RUN /tmp/build-kmod-wl.sh
RUN /tmp/build-kmod-xpadneo.sh
RUN /tmp/build-kmod-xpad-noone.sh
RUN /tmp/build-kmod-xone.sh

# Exclude negativo17 kmods from Fedora 39
RUN if grep -qv "39" <<< ${FEDORA_MAJOR_VERSION}; then \
/tmp/build-kmod-evdi.sh && \
/tmp/build-kmod-xpadneo.sh && \
/tmp/build-kmod-xpad-noone.sh && \
/tmp/build-kmod-xone.sh \
; fi

RUN cp /tmp/ublue-os-akmods-addons/rpmbuild/RPMS/noarch/ublue-os-akmods-addons*.rpm \
/var/cache/rpms/ublue-os/
Expand Down
8 changes: 6 additions & 2 deletions build-prep.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,12 @@ set -oeux pipefail
ARCH="$(rpm -E '%_arch')"
RELEASE="$(rpm -E '%fedora')"


sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-{cisco-openh264,modular,updates-modular}.repo
# Modularity repositories are not available on Fedora 39 and above, so don't try to disable them
if [[ "${FEDORA_MAJOR_VERSION}" -le 38 ]]; then
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-{cisco-openh264,modular,updates-modular}.repo
else
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-cisco-openh264.repo
fi

# enable RPMs with alternatives to create them in this image build
mkdir -p /var/lib/alternatives
Expand Down

0 comments on commit 37628a2

Please sign in to comment.