Skip to content

Commit 24d4cd3

Browse files
EbonJaegerEbonJaeger
committed
xone: Rebuild for kernels
Signed-off-by: Evan Maddock <maddock.evan@vivaldi.net>
1 parent fb26b1a commit 24d4cd3

2 files changed

Lines changed: 107 additions & 109 deletions

File tree

‎packages/x/xone/package.yml‎

Lines changed: 58 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# yaml-language-server: $schema=/usr/share/ypkg/schema/schema.json
22
name : xone
33
version : 0.5.8
4-
release : 132
4+
release : 133
55
source :
66
- https://github.com/dlundqvist/xone/archive/refs/tags/v0.5.8.tar.gz : f1905d5046ce79b94df0501045008203c4ae4ce6f43dbcf8bd04d7c944bf420e
77
- git|https://github.com/forkymcforkface/xpad-noone : 7b5361475c719b03b9e0152e44cf7fca0b85af60
@@ -25,18 +25,6 @@ builddeps :
2525
- linux-current-headers
2626
- linux-lts
2727
- linux-lts-headers
28-
patterns :
29-
- common : /*
30-
- main :
31-
- /lib64/modules/*.lts
32-
- /usr/lib64/modules/*.lts
33-
- current :
34-
- /lib64/modules/*.current
35-
- /usr/lib64/modules/*.current
36-
- modaliases : /usr/share/linux-driver-management/modaliases
37-
permanent :
38-
- /lib64/modules
39-
- /usr/lib64/modules
4028
rundeps :
4129
- common :
4230
- cabextract
@@ -45,75 +33,84 @@ rundeps :
4533
- current :
4634
- xone-common
4735
- xone-common
48-
#environment:
49-
# export CFLAGS="${CFLAGS} -Wno-implicit-function-declaration" # gcc 14
36+
environment: |
37+
kernels=(
38+
%kernel_version_current%
39+
%kernel_version_lts%
40+
)
5041
setup : |
51-
# Prep build dirs for each kernel version
52-
pushd ../
53-
for KVER in %kernel_version_lts% %kernel_version_current%
54-
do
55-
mkdir ${KVER}-build
56-
cp -a "xone-${version}" ${KVER}-build/xone
57-
cp -r $sources/xpad-noone.git ${KVER}-build/xpad-noone
42+
pushd ..
43+
44+
for _kernel in "${kernels[@]}"; do
45+
mkdir "${_kernel}"
46+
cp -a "xone-${version}" "${_kernel}"/xone
47+
cp -a "${sources}/xpad-noone.git" "${_kernel}/xpad-noone"
5848
done
59-
popd
6049
build : |
61-
for KVER in %kernel_version_lts% %kernel_version_current%
62-
do
63-
pushd ${KVER}-build
64-
65-
# Build xone kernel modules
66-
pushd xone
67-
%make -C /usr/lib64/modules/$KVER/build M=$PWD
68-
popd
50+
for _kernel in "${kernels[@]}"; do
51+
pushd "${_kernel}"
6952
70-
# Build xpad-noone kernel modules
71-
pushd xpad-noone
72-
%make -C /usr/lib64/modules/$KVER/build M=$PWD
73-
popd
53+
# Build xone kernel modules
54+
pushd xone
55+
%make -C "%libdir%/modules/${_kernel}/build" M="${PWD}"
56+
popd
7457
75-
# Build modaliases for LDM
76-
mkmodaliases "${package}" -o "${package}.modaliases" {xone,xpad-noone}/*.ko
58+
# Build xpad-noone kernel modules
59+
pushd xpad-noone
60+
%make -C "%libdir%/modules/${_kernel}/build" M="${PWD}"
61+
popd
7762
78-
popd
63+
# Build modaliases for LDM
64+
mkmodaliases "${package}" -o "${package}.modaliases" {xone,xpad-noone}/*.ko
65+
popd
7966
done
8067
install : |
81-
for KVER in %kernel_version_lts% %kernel_version_current%
82-
do
83-
pushd ${KVER}-build
68+
for _kernel in "${kernels[@]}"; do
69+
pushd "${_kernel}"
8470
85-
# Install xone
86-
pushd xone
87-
install -D -d -m 00644 $installdir/usr/lib64/modules/$KVER/extra/drivers/input/joystick
88-
install -D -m 00644 *.ko $installdir/usr/lib64/modules/$KVER/extra/drivers/input/joystick/.
89-
install -D -m 00644 install/modprobe.conf $installdir/usr/lib/modprobe.d/xone-blacklist.conf
90-
install -D -m 00755 install/firmware.sh $installdir/usr/bin/xone-get-firmware.sh
91-
popd
71+
# Install xone
72+
pushd xone
73+
%install_file *.ko -t "${installdir}/%libdir%/modules/${_kernel}/extra/drivers/input/joystick"
74+
%install_file install/modprobe.conf ${installdir}/usr/lib/modprobe.d/xone-blacklist.conf
75+
%install_file install/firmware.sh ${installdir}/usr/bin/xone-get-firmware.sh
76+
%install_license LICENSE
77+
popd
9278
93-
# Install xpad-noone
94-
pushd xpad-noone
95-
install -D -m 00644 *.ko $installdir/usr/lib64/modules/$KVER/extra/drivers/input/joystick/.
96-
popd
79+
# Install xpad-noone
80+
pushd xpad-noone
81+
%install_file *.ko -t "${installdir}/%libdir%/modules/${_kernel}/extra/drivers/input/joystick"
82+
popd
9783
98-
# Install modaliases for hardware detection
99-
install -D -m 00644 ${package}.modaliases $installdir/usr/share/linux-driver-management/modaliases/${package}.modaliases
100-
101-
popd
84+
# Install modaliases for hardware detection
85+
%install_file ${package}.modaliases -t ${installdir}/usr/share/linux-driver-management/modaliases
86+
popd
10287
done
10388
10489
# Compress modules with zstd
105-
find "$installdir" -name '*.ko' -exec strip --strip-debug {} \; -exec zstd {} \; -exec rm -v {} \;
90+
find "${installdir}" -name '*.ko' -exec strip --strip-debug {} \; -exec zstd {} \; -exec rm -v {} \;
10691
10792
# Usr-merge
108-
install -dm00755 $installdir/lib64
109-
pushd $installdir/usr
93+
%install_dir ${installdir}/lib64
94+
pushd ${installdir}/usr
11095
file_list=()
11196
while IFS= read -r -d $'\0'; do
11297
file_list+=("$REPLY")
11398
done < <(find lib64/modules -type f -print0)
11499
for file in "${file_list[@]}"; do
115100
parent=$(dirname "$file")
116-
install -dm00755 "$installdir/$parent"
117-
ln -srv "$installdir/usr/$file" "$installdir/$file"
101+
%install_dir "${installdir}/${parent}"
102+
ln -srv "${installdir}/usr/${file}" "${installdir}/${file}"
118103
done
119104
popd
105+
patterns :
106+
- common : /*
107+
- main :
108+
- /lib64/modules/*.lts
109+
- /usr/lib64/modules/*.lts
110+
- current :
111+
- /lib64/modules/*.current
112+
- /usr/lib64/modules/*.current
113+
- modaliases : /usr/share/linux-driver-management/modaliases
114+
permanent :
115+
- /lib64/modules
116+
- /usr/lib64/modules

‎packages/x/xone/pspec_x86_64.xml‎

Lines changed: 49 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<Name>xone</Name>
44
<Homepage>https://github.com/dlundqvist/xone</Homepage>
55
<Packager>
6-
<Name>Troy Harvey</Name>
7-
<Email>harvey@getsol.us</Email>
6+
<Name>Evan Maddock</Name>
7+
<Email>maddock.evan@vivaldi.net</Email>
88
</Packager>
99
<License>GPL-2.0-or-later</License>
1010
<PartOf>kernel.drivers</PartOf>
@@ -20,29 +20,29 @@
2020
</Description>
2121
<PartOf>kernel.drivers</PartOf>
2222
<RuntimeDependencies>
23-
<Dependency releaseFrom="132">xone-common</Dependency>
23+
<Dependency releaseFrom="133">xone-common</Dependency>
2424
</RuntimeDependencies>
2525
<Files>
26-
<Path fileType="data">/lib64/modules/6.18.48-307.lts/extra/drivers/input/joystick/xone_dongle.ko.zst</Path>
27-
<Path fileType="data">/lib64/modules/6.18.48-307.lts/extra/drivers/input/joystick/xone_gip.ko.zst</Path>
28-
<Path fileType="data">/lib64/modules/6.18.48-307.lts/extra/drivers/input/joystick/xone_gip_chatpad.ko.zst</Path>
29-
<Path fileType="data">/lib64/modules/6.18.48-307.lts/extra/drivers/input/joystick/xone_gip_gamepad.ko.zst</Path>
30-
<Path fileType="data">/lib64/modules/6.18.48-307.lts/extra/drivers/input/joystick/xone_gip_headset.ko.zst</Path>
31-
<Path fileType="data">/lib64/modules/6.18.48-307.lts/extra/drivers/input/joystick/xone_gip_madcatz_glam.ko.zst</Path>
32-
<Path fileType="data">/lib64/modules/6.18.48-307.lts/extra/drivers/input/joystick/xone_gip_madcatz_strat.ko.zst</Path>
33-
<Path fileType="data">/lib64/modules/6.18.48-307.lts/extra/drivers/input/joystick/xone_gip_pdp_jaguar.ko.zst</Path>
34-
<Path fileType="data">/lib64/modules/6.18.48-307.lts/extra/drivers/input/joystick/xone_wired.ko.zst</Path>
35-
<Path fileType="data">/lib64/modules/6.18.48-307.lts/extra/drivers/input/joystick/xpad-noone.ko.zst</Path>
36-
<Path fileType="library">/usr/lib64/modules/6.18.48-307.lts/extra/drivers/input/joystick/xone_dongle.ko.zst</Path>
37-
<Path fileType="library">/usr/lib64/modules/6.18.48-307.lts/extra/drivers/input/joystick/xone_gip.ko.zst</Path>
38-
<Path fileType="library">/usr/lib64/modules/6.18.48-307.lts/extra/drivers/input/joystick/xone_gip_chatpad.ko.zst</Path>
39-
<Path fileType="library">/usr/lib64/modules/6.18.48-307.lts/extra/drivers/input/joystick/xone_gip_gamepad.ko.zst</Path>
40-
<Path fileType="library">/usr/lib64/modules/6.18.48-307.lts/extra/drivers/input/joystick/xone_gip_headset.ko.zst</Path>
41-
<Path fileType="library">/usr/lib64/modules/6.18.48-307.lts/extra/drivers/input/joystick/xone_gip_madcatz_glam.ko.zst</Path>
42-
<Path fileType="library">/usr/lib64/modules/6.18.48-307.lts/extra/drivers/input/joystick/xone_gip_madcatz_strat.ko.zst</Path>
43-
<Path fileType="library">/usr/lib64/modules/6.18.48-307.lts/extra/drivers/input/joystick/xone_gip_pdp_jaguar.ko.zst</Path>
44-
<Path fileType="library">/usr/lib64/modules/6.18.48-307.lts/extra/drivers/input/joystick/xone_wired.ko.zst</Path>
45-
<Path fileType="library">/usr/lib64/modules/6.18.48-307.lts/extra/drivers/input/joystick/xpad-noone.ko.zst</Path>
26+
<Path fileType="data">/lib64/modules/6.18.50-308.lts/extra/drivers/input/joystick/xone_dongle.ko.zst</Path>
27+
<Path fileType="data">/lib64/modules/6.18.50-308.lts/extra/drivers/input/joystick/xone_gip.ko.zst</Path>
28+
<Path fileType="data">/lib64/modules/6.18.50-308.lts/extra/drivers/input/joystick/xone_gip_chatpad.ko.zst</Path>
29+
<Path fileType="data">/lib64/modules/6.18.50-308.lts/extra/drivers/input/joystick/xone_gip_gamepad.ko.zst</Path>
30+
<Path fileType="data">/lib64/modules/6.18.50-308.lts/extra/drivers/input/joystick/xone_gip_headset.ko.zst</Path>
31+
<Path fileType="data">/lib64/modules/6.18.50-308.lts/extra/drivers/input/joystick/xone_gip_madcatz_glam.ko.zst</Path>
32+
<Path fileType="data">/lib64/modules/6.18.50-308.lts/extra/drivers/input/joystick/xone_gip_madcatz_strat.ko.zst</Path>
33+
<Path fileType="data">/lib64/modules/6.18.50-308.lts/extra/drivers/input/joystick/xone_gip_pdp_jaguar.ko.zst</Path>
34+
<Path fileType="data">/lib64/modules/6.18.50-308.lts/extra/drivers/input/joystick/xone_wired.ko.zst</Path>
35+
<Path fileType="data">/lib64/modules/6.18.50-308.lts/extra/drivers/input/joystick/xpad-noone.ko.zst</Path>
36+
<Path fileType="library">/usr/lib64/modules/6.18.50-308.lts/extra/drivers/input/joystick/xone_dongle.ko.zst</Path>
37+
<Path fileType="library">/usr/lib64/modules/6.18.50-308.lts/extra/drivers/input/joystick/xone_gip.ko.zst</Path>
38+
<Path fileType="library">/usr/lib64/modules/6.18.50-308.lts/extra/drivers/input/joystick/xone_gip_chatpad.ko.zst</Path>
39+
<Path fileType="library">/usr/lib64/modules/6.18.50-308.lts/extra/drivers/input/joystick/xone_gip_gamepad.ko.zst</Path>
40+
<Path fileType="library">/usr/lib64/modules/6.18.50-308.lts/extra/drivers/input/joystick/xone_gip_headset.ko.zst</Path>
41+
<Path fileType="library">/usr/lib64/modules/6.18.50-308.lts/extra/drivers/input/joystick/xone_gip_madcatz_glam.ko.zst</Path>
42+
<Path fileType="library">/usr/lib64/modules/6.18.50-308.lts/extra/drivers/input/joystick/xone_gip_madcatz_strat.ko.zst</Path>
43+
<Path fileType="library">/usr/lib64/modules/6.18.50-308.lts/extra/drivers/input/joystick/xone_gip_pdp_jaguar.ko.zst</Path>
44+
<Path fileType="library">/usr/lib64/modules/6.18.50-308.lts/extra/drivers/input/joystick/xone_wired.ko.zst</Path>
45+
<Path fileType="library">/usr/lib64/modules/6.18.50-308.lts/extra/drivers/input/joystick/xpad-noone.ko.zst</Path>
4646
</Files>
4747
</Package>
4848
<Package>
@@ -54,6 +54,7 @@
5454
<Files>
5555
<Path fileType="executable">/usr/bin/xone-get-firmware.sh</Path>
5656
<Path fileType="library">/usr/lib/modprobe.d/xone-blacklist.conf</Path>
57+
<Path fileType="data">/usr/share/licenses/xone/LICENSE</Path>
5758
</Files>
5859
</Package>
5960
<Package>
@@ -63,29 +64,29 @@
6364
</Description>
6465
<PartOf>kernel.drivers</PartOf>
6566
<RuntimeDependencies>
66-
<Dependency releaseFrom="132">xone-common</Dependency>
67+
<Dependency releaseFrom="133">xone-common</Dependency>
6768
</RuntimeDependencies>
6869
<Files>
69-
<Path fileType="data">/lib64/modules/7.1.12-357.current/extra/drivers/input/joystick/xone_dongle.ko.zst</Path>
70-
<Path fileType="data">/lib64/modules/7.1.12-357.current/extra/drivers/input/joystick/xone_gip.ko.zst</Path>
71-
<Path fileType="data">/lib64/modules/7.1.12-357.current/extra/drivers/input/joystick/xone_gip_chatpad.ko.zst</Path>
72-
<Path fileType="data">/lib64/modules/7.1.12-357.current/extra/drivers/input/joystick/xone_gip_gamepad.ko.zst</Path>
73-
<Path fileType="data">/lib64/modules/7.1.12-357.current/extra/drivers/input/joystick/xone_gip_headset.ko.zst</Path>
74-
<Path fileType="data">/lib64/modules/7.1.12-357.current/extra/drivers/input/joystick/xone_gip_madcatz_glam.ko.zst</Path>
75-
<Path fileType="data">/lib64/modules/7.1.12-357.current/extra/drivers/input/joystick/xone_gip_madcatz_strat.ko.zst</Path>
76-
<Path fileType="data">/lib64/modules/7.1.12-357.current/extra/drivers/input/joystick/xone_gip_pdp_jaguar.ko.zst</Path>
77-
<Path fileType="data">/lib64/modules/7.1.12-357.current/extra/drivers/input/joystick/xone_wired.ko.zst</Path>
78-
<Path fileType="data">/lib64/modules/7.1.12-357.current/extra/drivers/input/joystick/xpad-noone.ko.zst</Path>
79-
<Path fileType="library">/usr/lib64/modules/7.1.12-357.current/extra/drivers/input/joystick/xone_dongle.ko.zst</Path>
80-
<Path fileType="library">/usr/lib64/modules/7.1.12-357.current/extra/drivers/input/joystick/xone_gip.ko.zst</Path>
81-
<Path fileType="library">/usr/lib64/modules/7.1.12-357.current/extra/drivers/input/joystick/xone_gip_chatpad.ko.zst</Path>
82-
<Path fileType="library">/usr/lib64/modules/7.1.12-357.current/extra/drivers/input/joystick/xone_gip_gamepad.ko.zst</Path>
83-
<Path fileType="library">/usr/lib64/modules/7.1.12-357.current/extra/drivers/input/joystick/xone_gip_headset.ko.zst</Path>
84-
<Path fileType="library">/usr/lib64/modules/7.1.12-357.current/extra/drivers/input/joystick/xone_gip_madcatz_glam.ko.zst</Path>
85-
<Path fileType="library">/usr/lib64/modules/7.1.12-357.current/extra/drivers/input/joystick/xone_gip_madcatz_strat.ko.zst</Path>
86-
<Path fileType="library">/usr/lib64/modules/7.1.12-357.current/extra/drivers/input/joystick/xone_gip_pdp_jaguar.ko.zst</Path>
87-
<Path fileType="library">/usr/lib64/modules/7.1.12-357.current/extra/drivers/input/joystick/xone_wired.ko.zst</Path>
88-
<Path fileType="library">/usr/lib64/modules/7.1.12-357.current/extra/drivers/input/joystick/xpad-noone.ko.zst</Path>
70+
<Path fileType="data">/lib64/modules/7.2.4-358.current/extra/drivers/input/joystick/xone_dongle.ko.zst</Path>
71+
<Path fileType="data">/lib64/modules/7.2.4-358.current/extra/drivers/input/joystick/xone_gip.ko.zst</Path>
72+
<Path fileType="data">/lib64/modules/7.2.4-358.current/extra/drivers/input/joystick/xone_gip_chatpad.ko.zst</Path>
73+
<Path fileType="data">/lib64/modules/7.2.4-358.current/extra/drivers/input/joystick/xone_gip_gamepad.ko.zst</Path>
74+
<Path fileType="data">/lib64/modules/7.2.4-358.current/extra/drivers/input/joystick/xone_gip_headset.ko.zst</Path>
75+
<Path fileType="data">/lib64/modules/7.2.4-358.current/extra/drivers/input/joystick/xone_gip_madcatz_glam.ko.zst</Path>
76+
<Path fileType="data">/lib64/modules/7.2.4-358.current/extra/drivers/input/joystick/xone_gip_madcatz_strat.ko.zst</Path>
77+
<Path fileType="data">/lib64/modules/7.2.4-358.current/extra/drivers/input/joystick/xone_gip_pdp_jaguar.ko.zst</Path>
78+
<Path fileType="data">/lib64/modules/7.2.4-358.current/extra/drivers/input/joystick/xone_wired.ko.zst</Path>
79+
<Path fileType="data">/lib64/modules/7.2.4-358.current/extra/drivers/input/joystick/xpad-noone.ko.zst</Path>
80+
<Path fileType="library">/usr/lib64/modules/7.2.4-358.current/extra/drivers/input/joystick/xone_dongle.ko.zst</Path>
81+
<Path fileType="library">/usr/lib64/modules/7.2.4-358.current/extra/drivers/input/joystick/xone_gip.ko.zst</Path>
82+
<Path fileType="library">/usr/lib64/modules/7.2.4-358.current/extra/drivers/input/joystick/xone_gip_chatpad.ko.zst</Path>
83+
<Path fileType="library">/usr/lib64/modules/7.2.4-358.current/extra/drivers/input/joystick/xone_gip_gamepad.ko.zst</Path>
84+
<Path fileType="library">/usr/lib64/modules/7.2.4-358.current/extra/drivers/input/joystick/xone_gip_headset.ko.zst</Path>
85+
<Path fileType="library">/usr/lib64/modules/7.2.4-358.current/extra/drivers/input/joystick/xone_gip_madcatz_glam.ko.zst</Path>
86+
<Path fileType="library">/usr/lib64/modules/7.2.4-358.current/extra/drivers/input/joystick/xone_gip_madcatz_strat.ko.zst</Path>
87+
<Path fileType="library">/usr/lib64/modules/7.2.4-358.current/extra/drivers/input/joystick/xone_gip_pdp_jaguar.ko.zst</Path>
88+
<Path fileType="library">/usr/lib64/modules/7.2.4-358.current/extra/drivers/input/joystick/xone_wired.ko.zst</Path>
89+
<Path fileType="library">/usr/lib64/modules/7.2.4-358.current/extra/drivers/input/joystick/xpad-noone.ko.zst</Path>
8990
</Files>
9091
</Package>
9192
<Package>
@@ -99,12 +100,12 @@
99100
</Files>
100101
</Package>
101102
<History>
102-
<Update release="132">
103-
<Date>2026-08-31</Date>
103+
<Update release="133">
104+
<Date>2026-09-08</Date>
104105
<Version>0.5.8</Version>
105106
<Comment>Packaging update</Comment>
106-
<Name>Troy Harvey</Name>
107-
<Email>harvey@getsol.us</Email>
107+
<Name>Evan Maddock</Name>
108+
<Email>maddock.evan@vivaldi.net</Email>
108109
</Update>
109110
</History>
110111
</PISI>

0 commit comments

Comments
 (0)