From 6f50817806e1b85d60d4e6a6f66ed3b275200c45 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Tue, 23 Jan 2024 17:52:20 -0800 Subject: [PATCH] feat: Switch to modified xone that retains full support for xpad, resolves issues with third party game controllers in previous releases. chore: Remove unneeded amdgpu.conf thanks to fsync kernel. --- Containerfile | 1 - .../shared/usr/bin/bazzite-hardware-setup | 25 ++++++++++++++++++- .../desktop/shared/usr/bin/bazzite-user-setup | 2 -- .../shared/usr/etc/modprobe.d/amdgpu.conf | 5 ---- .../shared/usr/etc/modprobe.d/xone.conf | 1 - .../etc/modprobe.d/xpad-noone-blacklist.conf | 1 - .../shared/usr/etc/modprobe.d/xpadneo.conf | 1 - .../usr/etc/modules-load.d/xpad-noone.conf | 1 - 8 files changed, 24 insertions(+), 13 deletions(-) delete mode 100644 system_files/desktop/shared/usr/etc/modprobe.d/amdgpu.conf delete mode 100644 system_files/desktop/shared/usr/etc/modprobe.d/xone.conf delete mode 100644 system_files/desktop/shared/usr/etc/modprobe.d/xpad-noone-blacklist.conf delete mode 100644 system_files/desktop/shared/usr/etc/modprobe.d/xpadneo.conf delete mode 100644 system_files/desktop/shared/usr/etc/modules-load.d/xpad-noone.conf diff --git a/Containerfile b/Containerfile index dcaa4895..c398b832 100644 --- a/Containerfile +++ b/Containerfile @@ -83,7 +83,6 @@ 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 && \ 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 \ diff --git a/system_files/desktop/shared/usr/bin/bazzite-hardware-setup b/system_files/desktop/shared/usr/bin/bazzite-hardware-setup index 15d459c6..a6479d90 100755 --- a/system_files/desktop/shared/usr/bin/bazzite-hardware-setup +++ b/system_files/desktop/shared/usr/bin/bazzite-hardware-setup @@ -7,7 +7,7 @@ IMAGE_FLAVOR=$(jq -r '."image-flavor"' < $IMAGE_INFO) FEDORA_VERSION=$(jq -r '."fedora-version"' < $IMAGE_INFO) # SCRIPT VERSION -HWS_VER=22 +HWS_VER=23 HWS_VER_FILE="/etc/bazzite/hws_version" HWS_VER_RAN=$(cat $HWS_VER_FILE) @@ -215,6 +215,29 @@ if grep -qv "graphical.target" <<< "$(systemctl get-default)"; then systemctl set-default graphical.target fi +# CLEAN UP +# AMDGPU settings change that the fsync kernel now handles. +if [[ -f "/etc/modprobe.d/amdgpu.conf" ]]; then + rm -f "/etc/modprobe.d/amdgpu.conf" +fi +# Controller chnages are no longer needed thanks to patched xone driver. +if [[ -f "/etc/modprobe.d/xone.conf" ]]; then + rm -f "/etc/modprobe.d/xone.conf" +fi +if [[ -f "/etc/modprobe.d/xpad-noone-blacklist.conf" ]]; then + rm -f "/etc/modprobe.d/xpad-noone-blacklist.conf" +fi +if [[ -f "/etc/modules-load.d/xpad-noone.conf" ]]; then + rm -f "/etc/modules-load.d/xpad-noone.conf" +fi +if [[ -f "/etc/modprobe.d/xpadneo.conf" ]]; then + rm -f "/etc/modprobe.d/xpadneo.conf" +fi +# Previous optional solution for zenpower3 that has been replaced with zenergy. +if [[ -f "/etc/modprobe.d/amdcpu.conf" ]]; then + rm -f "/etc/modprobe.d/amdcpu.conf" +fi + mkdir -p /etc/bazzite echo $HWS_VER > $HWS_VER_FILE echo $IMAGE_NAME > $KNOWN_IMAGE_NAME_FILE diff --git a/system_files/desktop/shared/usr/bin/bazzite-user-setup b/system_files/desktop/shared/usr/bin/bazzite-user-setup index 2b440e27..4983ccb1 100755 --- a/system_files/desktop/shared/usr/bin/bazzite-user-setup +++ b/system_files/desktop/shared/usr/bin/bazzite-user-setup @@ -49,11 +49,9 @@ THEME_DIR="/usr/share/ublue-os/bazzite/themes" GRADIENCE_DIR="$HOME/.var/app/com.github.GradienceTeam.Gradience/config/presets/user" mkdir -p "$GRADIENCE_DIR" if [[ ! -f "$GRADIENCE_DIR/vapor.json" ]]; then - rm -f "$GRADIENCE_DIR/vapor.json" cp "$THEME_DIR/vapor.json" "$GRADIENCE_DIR/vapor.json" fi if [[ ! -f "$GRADIENCE_DIR/vgui2.json" ]]; then - rm -f "$GRADIENCE_DIR/vgui2.json" cp "$THEME_DIR/vgui2.json" "$GRADIENCE_DIR/vgui2.json" fi diff --git a/system_files/desktop/shared/usr/etc/modprobe.d/amdgpu.conf b/system_files/desktop/shared/usr/etc/modprobe.d/amdgpu.conf deleted file mode 100644 index 1350ddca..00000000 --- a/system_files/desktop/shared/usr/etc/modprobe.d/amdgpu.conf +++ /dev/null @@ -1,5 +0,0 @@ -# Use Vulkan driver for AMD GCN 1.0 & GCN 2.0 GPUs (HD 7000-8000 series) -options amdgpu si_support=1 -options amdgpu cik_support=1 -options radeon si_support=0 -options radeon cik_support=0 diff --git a/system_files/desktop/shared/usr/etc/modprobe.d/xone.conf b/system_files/desktop/shared/usr/etc/modprobe.d/xone.conf deleted file mode 100644 index ca8c4022..00000000 --- a/system_files/desktop/shared/usr/etc/modprobe.d/xone.conf +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally empty diff --git a/system_files/desktop/shared/usr/etc/modprobe.d/xpad-noone-blacklist.conf b/system_files/desktop/shared/usr/etc/modprobe.d/xpad-noone-blacklist.conf deleted file mode 100644 index ca8c4022..00000000 --- a/system_files/desktop/shared/usr/etc/modprobe.d/xpad-noone-blacklist.conf +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally empty diff --git a/system_files/desktop/shared/usr/etc/modprobe.d/xpadneo.conf b/system_files/desktop/shared/usr/etc/modprobe.d/xpadneo.conf deleted file mode 100644 index ca8c4022..00000000 --- a/system_files/desktop/shared/usr/etc/modprobe.d/xpadneo.conf +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally empty diff --git a/system_files/desktop/shared/usr/etc/modules-load.d/xpad-noone.conf b/system_files/desktop/shared/usr/etc/modules-load.d/xpad-noone.conf deleted file mode 100644 index ca8c4022..00000000 --- a/system_files/desktop/shared/usr/etc/modules-load.d/xpad-noone.conf +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally empty