mirror/bazzite
1
0
Fork 0
mirror of https://github.com/ublue-os/bazzite.git synced 2025-04-11 00:44:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #352 from ublue-os/nokmods

Browse Source 
feat: Enable builds without kmods
This commit is contained in:
Kyle Gospodnetich 2023-09-23 13:18:59 -07:00 committed by GitHub
commit d28a0393f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -36,7 +36,7 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
image_flavor: [main, nvidia] image_flavor: [main, nokmods, nvidia]
base_name: [bazzite, bazzite-deck] base_name: [bazzite, bazzite-deck]
base_image_name: [kinoite, silverblue] base_image_name: [kinoite, silverblue]
major_version: [38] major_version: [38]

28
Containerfile
View File

@ -16,7 +16,8 @@ COPY system_files/shared system_files/desktop/shared system_files/desktop/${BASE
# Add ublue packages, add needed negativo17 repo and then immediately disable due to incompatibility with RPMFusion # Add ublue packages, add needed negativo17 repo and then immediately disable due to incompatibility with RPMFusion
COPY --from=ghcr.io/ublue-os/akmods:${FEDORA_MAJOR_VERSION} /rpms /tmp/akmods-rpms COPY --from=ghcr.io/ublue-os/akmods:${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 && \ RUN if grep -qv "nokmods" <<< ${IMAGE_FLAVOR}; 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 && \ wget https://negativo17.org/repos/fedora-multimedia.repo -O /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \
rpm-ostree install \ rpm-ostree install \
/tmp/akmods-rpms/kmods/*gcadapter_oc*.rpm \ /tmp/akmods-rpms/kmods/*gcadapter_oc*.rpm \
@ -24,7 +25,8 @@ RUN sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo
/tmp/akmods-rpms/kmods/*openrgb*.rpm \ /tmp/akmods-rpms/kmods/*openrgb*.rpm \
/tmp/akmods-rpms/kmods/*ryzen-smu*.rpm \ /tmp/akmods-rpms/kmods/*ryzen-smu*.rpm \
/tmp/akmods-rpms/kmods/*evdi*.rpm && \ /tmp/akmods-rpms/kmods/*evdi*.rpm && \
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo \
; fi
# Setup Copr repos # Setup Copr repos
RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/repo/fedora-$(rpm -E %fedora)/kylegospo-bazzite-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \ RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/repo/fedora-$(rpm -E %fedora)/kylegospo-bazzite-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \
@ -167,7 +169,9 @@ RUN /tmp/image-info.sh && \
pip install --prefix=/usr yafti && \ pip install --prefix=/usr yafti && \
pip install --prefix=/usr hyfetch && \ pip install --prefix=/usr hyfetch && \
sed -i 's/stage/none/g' /etc/rpm-ostreed.conf && \ sed -i 's/stage/none/g' /etc/rpm-ostreed.conf && \
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \ if grep -qv "nokmods" <<< ${IMAGE_FLAVOR}; then \
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo \
; fi && \
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo && \
sed -i 's@enabled=1@enabeld=0@g' /etc/yum.repos.d/_copr_ublue-os-staging.repo && \ sed -i 's@enabled=1@enabeld=0@g' /etc/yum.repos.d/_copr_ublue-os-staging.repo && \
@ -188,7 +192,9 @@ RUN /tmp/image-info.sh && \
mkdir -p /usr/etc/flatpak/remotes.d && \ mkdir -p /usr/etc/flatpak/remotes.d && \
wget -q https://dl.flathub.org/repo/flathub.flatpakrepo -P /usr/etc/flatpak/remotes.d && \ wget -q https://dl.flathub.org/repo/flathub.flatpakrepo -P /usr/etc/flatpak/remotes.d && \
systemctl enable com.system76.Scheduler.service && \ systemctl enable com.system76.Scheduler.service && \
systemctl enable displaylink.service && \ if grep -qv "nokmods" <<< ${IMAGE_FLAVOR}; then \
systemctl enable displaylink.service \
; fi && \
systemctl enable btrfs-dedup@var-home.timer && \ systemctl enable btrfs-dedup@var-home.timer && \
systemctl enable input-remapper.service && \ systemctl enable input-remapper.service && \
systemctl unmask bazzite-flatpak-manager.service && \ systemctl unmask bazzite-flatpak-manager.service && \
@ -231,7 +237,9 @@ COPY system_files/shared system_files/deck/shared system_files/deck/${BASE_IMAGE
# Setup Copr repos # Setup Copr repos
RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/LatencyFleX/repo/fedora-$(rpm -E %fedora)/kylegospo-LatencyFleX-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo-latencyflex.repo && \ RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/LatencyFleX/repo/fedora-$(rpm -E %fedora)/kylegospo-LatencyFleX-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo-latencyflex.repo && \
wget https://copr.fedorainfracloud.org/coprs/mavit/discover-overlay/repo/fedora-$(rpm -E %fedora)/mavit-discover-overlay-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_mavit_discover.repo && \ wget https://copr.fedorainfracloud.org/coprs/mavit/discover-overlay/repo/fedora-$(rpm -E %fedora)/mavit-discover-overlay-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_mavit_discover.repo && \
sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \ if grep -qv "nokmods" <<< ${IMAGE_FLAVOR}; then \
sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo \
; fi && \
sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \ sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \
sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo && \ sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo && \
sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_kylegospo-hl2linux-selinux.repo && \ sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_kylegospo-hl2linux-selinux.repo && \
@ -241,8 +249,10 @@ RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/LatencyFleX/repo/fedo
# Install Valve's Steam Deck drivers as kmods # Install Valve's Steam Deck drivers as kmods
COPY --from=ghcr.io/ublue-os/akmods:${FEDORA_MAJOR_VERSION} /rpms /tmp/akmods-rpms COPY --from=ghcr.io/ublue-os/akmods:${FEDORA_MAJOR_VERSION} /rpms /tmp/akmods-rpms
RUN rpm-ostree install \ RUN if grep -qv "nokmods" <<< ${IMAGE_FLAVOR}; then \
/tmp/akmods-rpms/kmods/*steamdeck*.rpm rpm-ostree install \
/tmp/akmods-rpms/kmods/*steamdeck*.rpm \
; fi
# Install gamescope-limiter patched Mesa and patched udisks2 (Needed for SteamOS SD card mounting) # Install gamescope-limiter patched Mesa and patched udisks2 (Needed for SteamOS SD card mounting)
RUN rpm-ostree override replace \ RUN rpm-ostree override replace \
@ -403,7 +413,9 @@ RUN /tmp/image-info.sh && \
rm /usr/share/applications/discover_overlay.desktop && \ rm /usr/share/applications/discover_overlay.desktop && \
cp "/usr/share/ublue-os/firstboot/yafti.yml" "/usr/etc/yafti.yml" && \ cp "/usr/share/ublue-os/firstboot/yafti.yml" "/usr/etc/yafti.yml" && \
sed -i 's/#HandlePowerKey=poweroff/HandlePowerKey=suspend/g' /etc/systemd/logind.conf && \ sed -i 's/#HandlePowerKey=poweroff/HandlePowerKey=suspend/g' /etc/systemd/logind.conf && \
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \ if grep -qv "nokmods" <<< ${IMAGE_FLAVOR}; then \
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo \
; fi && \
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo && \
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-latencyflex.repo && \ sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-latencyflex.repo && \

2
system_files/desktop/shared/usr/bin/bazzite-hardware-setup
View File

@ -120,7 +120,7 @@ if [[ $IMAGE_FLAVOR = "nvidia" ]]; then
if [[ ! $KARGS =~ "nvidia-drm.modeset" ]]; then if [[ ! $KARGS =~ "nvidia-drm.modeset" ]]; then
NEEDED_KARGS="$NEEDED_KARGS --append=nvidia-drm.modeset=1" NEEDED_KARGS="$NEEDED_KARGS --append=nvidia-drm.modeset=1"
fi fi
elif [[ $IMAGE_FLAVOR = "main" ]]; then else
echo "Checking for needed karg changes" echo "Checking for needed karg changes"
if [[ $KARGS =~ "rd.driver.blacklist" ]]; then if [[ $KARGS =~ "rd.driver.blacklist" ]]; then

2
system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml
View File

@ -67,7 +67,7 @@ screens:
values: values:
title: AMD Additions title: AMD Additions
condition: condition:
run: grep -q 'main' <<< $(jq -r '."image-flavor"' < /usr/share/ublue-os/image-info.json) run: grep -qv 'nvidia' <<< $(jq -r '."image-flavor"' < /usr/share/ublue-os/image-info.json)
show_terminal: true show_terminal: true
package_manager: yafti.plugin.run package_manager: yafti.plugin.run
packages: packages: