Skip to content

Commit 9325c1c

Browse files
authored
feat: Switch to modified xone driver which supports upstream xpad (#115)
1 parent 6f047bb commit 9325c1c

5 files changed

+5
-48
lines changed

Containerfile.common

+1-3
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,8 @@ RUN if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \
5454
/tmp/build-kmod-VirtualBox.sh && \
5555
/tmp/build-kmod-wl.sh && \
5656
/tmp/build-kmod-xpadneo.sh && \
57-
/tmp/build-kmod-xpad-noone.sh && \
5857
/tmp/build-kmod-xone.sh && \
59-
/tmp/build-kmod-zenergy.sh && \
60-
/tmp/build-kmod-zenpower3.sh
58+
/tmp/build-kmod-zenergy.sh
6159

6260
RUN cp /tmp/ublue-os-akmods-addons/rpmbuild/RPMS/noarch/ublue-os-akmods-addons*.rpm \
6361
/var/cache/rpms/ublue-os/

README.md

+1-3
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,8 @@ Feel free to PR more kmod build scripts into this repo!
2929
- [winesync](https://repo.or.cz/linux/zf.git/shortlog/refs/heads/winesync4) - Support for Winesync/Fastsync/NTSync primitives (akmod from [ublue-os/akmods copr](https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/))
3030
- [wl (broadcom)](https://github.com/rpmfusion/broadcom-wl/) - support for some legacy broadcom wifi devices
3131
- [xpadneo](https://github.com/atar-axis/xpadneo) - xbox one controller bluetooth driver (akmod from [negativo17 steam repo](https://negativo17.org/steam/)
32-
- [xpad-noone](https://github.com/ublue-os/xpad-noone) - xbox/xbox 360 controller driver (akmod from [ublue-os/akmods copr](https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/))
33-
- [xone](https://github.com/medusalix/xone) - xbox one controller USB wired/RF driver (akmod from [negativo17 steam repo](https://negativo17.org/steam/)
32+
- [xonedo](https://github.com/BoukeHaarsma23/xonedo/) - xbox one controller USB wired/RF driver modified to work along-side xpad (akmod from [ublue-os/akmods copr](https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/))
3433
- [zenergy](https://github.com/BoukeHaarsma23/zenergy) - Based on AMD_ENERGY driver, but with some jiffies added so non-root users can read it safely. (akmod from [ublue-os/akmods copr](https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/))
35-
- [zenpower3](https://git.exozy.me/a/zenpower3) - Zenpower3 is a Linux kernel driver for reading temperature, voltage(SVI2), current(SVI2) and power(SVI2) for AMD Zen family CPUs (akmod from [ublue-os/akmods copr](https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/))
3634

3735
# How it's organized
3836

build-kmod-xone.sh

+3-4
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
set -oeux pipefail
44

5-
6-
cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/negativo17-fedora-multimedia.repo /etc/yum.repos.d/
5+
cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/
76

87
ARCH="$(rpm -E '%_arch')"
98
KERNEL="$(rpm -q "${KERNEL_NAME}" --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
@@ -14,7 +13,7 @@ RELEASE="$(rpm -E '%fedora')"
1413
rpm-ostree install \
1514
akmod-xone-*.fc${RELEASE}.${ARCH}
1615
akmods --force --kernels "${KERNEL}" --kmod xone
17-
modinfo /usr/lib/modules/${KERNEL}/extra/xone/xone-{dongle,gip-chatpad,gip-gamepad,gip-guitar,gip-headset,gip,wired}.ko.xz > /dev/null \
16+
modinfo /usr/lib/modules/${KERNEL}/extra/xone/xone-{dongle,gip-chatpad,gip-gamepad,gip-guitar,gip-headset,gip}.ko.xz > /dev/null \
1817
|| (find /var/cache/akmods/xone/ -name \*.log -print -exec cat {} \; && exit 1)
1918

20-
rm -f /etc/yum.repos.d/negativo17-fedora-multimedia.repo
19+
rm -f /etc/yum.repos.d/_copr_ublue-os-akmods.repo

build-kmod-xpad-noone.sh

-19
This file was deleted.

build-kmod-zenpower3.sh

-19
This file was deleted.

0 commit comments

Comments
 (0)