Skip to content

Commit 940d309

Browse files
KyleGospoKyleGospo
committed
fix: Correct issues with selinux by moving files from /lib/hwsupport to /sbin/hwsupport in jupiter-hw-support packages.
1 parent 1f03d05 commit 940d309

File tree

3 files changed

+75
-6
lines changed

3 files changed

+75
-6
lines changed

‎spec_files/jupiter-hw-support/jupiter-hw-support-btrfs.spec‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ URL: https://github.com/ublue-os/bazzite
88

99
Source: https://gitlab.com/evlaV/%{packagename}/-/archive/master/%{packagename}-master.tar.gz
1010
Patch0: fedora.patch
11-
Patch1: https://gitlab.com/popsulfr/steamos-btrfs/-/raw/main/files/usr/lib/hwsupport/steamos-automount.sh.patch
12-
Patch2: https://gitlab.com/popsulfr/steamos-btrfs/-/raw/main/files/usr/lib/hwsupport/format-device.sh.patch
11+
Patch1: selinux.patch
12+
Patch2: https://gitlab.com/popsulfr/steamos-btrfs/-/raw/main/files/usr/lib/hwsupport/steamos-automount.sh.patch
13+
Patch3: https://gitlab.com/popsulfr/steamos-btrfs/-/raw/main/files/usr/lib/hwsupport/format-device.sh.patch
1314

1415
Requires: python3
1516
Requires: python3-libevdev
@@ -37,6 +38,7 @@ SteamOS 3.0 Steam Deck Hardware Support Package
3738
%patch 0 -p1
3839
%patch 1 -p1
3940
%patch 2 -p1
41+
%patch 3 -p1
4042

4143
%build
4244

@@ -45,10 +47,11 @@ export QA_RPATHS=0x0003
4547
mkdir -p %{buildroot}%{_datadir}/
4648
mkdir -p %{buildroot}%{_unitdir}/
4749
mkdir -p %{buildroot}%{_bindir}/
50+
mkdir -p %{buildroot}%{_sbindir}/
4851
mkdir -p %{buildroot}%{_sysconfdir}/
4952
cp -rv usr/share/* %{buildroot}%{_datadir}
5053
cp -rv usr/lib/systemd/system/* %{buildroot}%{_unitdir}/
51-
cp -rv usr/lib/hwsupport %{buildroot}%{_prefix}/lib/hwsupport
54+
cp -rv usr/lib/hwsupport %{buildroot}%{_sbindir}/hwsupport
5255
cp -rv usr/lib/udev %{buildroot}%{_prefix}/lib/udev
5356
cp -rv usr/bin/* %{buildroot}%{_bindir}
5457
cp -rv usr/lib/systemd/system/* %{buildroot}%{_unitdir}
@@ -88,7 +91,7 @@ rm -rf %{buildroot}%{_unitdir}/multi-user.target.wants
8891
%{_bindir}/thumbstick_cal
8992
%{_bindir}/thumbstick_fine_cal
9093
%{_bindir}/trigger_cal
91-
%{_prefix}/lib/hwsupport/*
94+
%{_sbindir}/hwsupport/*
9295
%{_prefix}/lib/systemd/system/*
9396
%{_prefix}/lib/udev/rules.d/*
9497
%{_datadir}/alsa/ucm2/conf.d/acp5x/*

‎spec_files/jupiter-hw-support/jupiter-hw-support.spec‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ URL: https://github.com/ublue-os/bazzite
77

88
Source: https://gitlab.com/evlaV/%{name}/-/archive/master/%{name}-master.tar.gz
99
Patch0: fedora.patch
10+
Patch1: selinux.patch
1011

1112
Requires: python3
1213
Requires: python3-libevdev
@@ -32,6 +33,7 @@ SteamOS 3.0 Steam Deck Hardware Support Package
3233
%prep
3334
%setup -n %{name}-master
3435
%patch 0 -p1
36+
%patch 1 -p1
3537

3638
%build
3739

@@ -40,10 +42,11 @@ export QA_RPATHS=0x0003
4042
mkdir -p %{buildroot}%{_datadir}/
4143
mkdir -p %{buildroot}%{_unitdir}/
4244
mkdir -p %{buildroot}%{_bindir}/
45+
mkdir -p %{buildroot}%{_sbindir}/
4346
mkdir -p %{buildroot}%{_sysconfdir}/
4447
cp -rv usr/share/* %{buildroot}%{_datadir}
4548
cp -rv usr/lib/systemd/system/* %{buildroot}%{_unitdir}/
46-
cp -rv usr/lib/hwsupport %{buildroot}%{_prefix}/lib/hwsupport
49+
cp -rv usr/lib/hwsupport %{buildroot}%{_sbindir}/hwsupport
4750
cp -rv usr/lib/udev %{buildroot}%{_prefix}/lib/udev
4851
cp -rv usr/bin/* %{buildroot}%{_bindir}
4952
cp -rv usr/lib/systemd/system/* %{buildroot}%{_unitdir}
@@ -83,7 +86,7 @@ rm -rf %{buildroot}%{_unitdir}/multi-user.target.wants
8386
%{_bindir}/thumbstick_cal
8487
%{_bindir}/thumbstick_fine_cal
8588
%{_bindir}/trigger_cal
86-
%{_prefix}/lib/hwsupport/*
89+
%{_sbindir}/hwsupport/*
8790
%{_prefix}/lib/systemd/system/*
8891
%{_prefix}/lib/udev/rules.d/*
8992
%{_datadir}/alsa/ucm2/conf.d/acp5x/*

‎spec_files/jupiter-hw-support/selinux.patch‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
diff --git a/etc/systemd/system/steamos-automount@.service b/etc/systemd/system/steamos-automount@.service
2+
index e71a736..8fe8aca 100644
3+
--- a/etc/systemd/system/steamos-automount@.service
4+
+++ b/etc/systemd/system/steamos-automount@.service
5+
@@ -14,6 +14,6 @@ Description=Mount removable drive %i and notify Steam
6+
[Service]
7+
Type=oneshot
8+
RemainAfterExit=true
9+
-ExecStart=/usr/lib/hwsupport/steamos-automount.sh add %i
10+
-ExecStop=/usr/lib/hwsupport/steamos-automount.sh remove %i
11+
-ExecReload=/usr/lib/hwsupport/steamos-automount.sh retrigger %i
12+
+ExecStart=/usr/sbin/hwsupport/steamos-automount.sh add %i
13+
+ExecStop=/usr/sbin/hwsupport/steamos-automount.sh remove %i
14+
+ExecReload=/usr/sbin/hwsupport/steamos-automount.sh retrigger %i
15+
diff --git a/usr/bin/steamos-polkit-helpers/jupiter-amp-control b/usr/bin/steamos-polkit-helpers/jupiter-amp-control
16+
index 3e0ed02..ed132dd 100755
17+
--- a/usr/bin/steamos-polkit-helpers/jupiter-amp-control
18+
+++ b/usr/bin/steamos-polkit-helpers/jupiter-amp-control
19+
@@ -7,4 +7,4 @@ then
20+
exec pkexec --disable-internal-agent "$0" "$@"
21+
fi
22+
23+
-exec /usr/lib/hwsupport/jupiter-amp-control "$@"
24+
+exec /usr/sbin/hwsupport/jupiter-amp-control "$@"
25+
diff --git a/usr/bin/steamos-polkit-helpers/steamos-format-device b/usr/bin/steamos-polkit-helpers/steamos-format-device
26+
index dcfe6b9..f3a7129 100755
27+
--- a/usr/bin/steamos-polkit-helpers/steamos-format-device
28+
+++ b/usr/bin/steamos-polkit-helpers/steamos-format-device
29+
@@ -8,4 +8,4 @@ then
30+
exec pkexec --disable-internal-agent "$0" --owner "$UID":"$gid" "$@"
31+
fi
32+
33+
-exec /usr/lib/hwsupport/format-device.sh "$@"
34+
+exec /usr/sbin/hwsupport/format-device.sh "$@"
35+
diff --git a/usr/bin/steamos-polkit-helpers/steamos-format-sdcard b/usr/bin/steamos-polkit-helpers/steamos-format-sdcard
36+
index 53b4f2a..4298a52 100755
37+
--- a/usr/bin/steamos-polkit-helpers/steamos-format-sdcard
38+
+++ b/usr/bin/steamos-polkit-helpers/steamos-format-sdcard
39+
@@ -8,4 +8,4 @@ then
40+
exec pkexec --disable-internal-agent "$0" --owner "$UID":"$gid" "$@"
41+
fi
42+
43+
-exec /usr/lib/hwsupport/format-sdcard.sh "$@"
44+
+exec /usr/sbin/hwsupport/format-sdcard.sh "$@"
45+
diff --git a/usr/bin/steamos-polkit-helpers/steamos-trim-devices b/usr/bin/steamos-polkit-helpers/steamos-trim-devices
46+
index 296a6c7..c382047 100755
47+
--- a/usr/bin/steamos-polkit-helpers/steamos-trim-devices
48+
+++ b/usr/bin/steamos-polkit-helpers/steamos-trim-devices
49+
@@ -7,4 +7,4 @@ then
50+
exec pkexec --disable-internal-agent "$0" "$@"
51+
fi
52+
53+
-exec /usr/lib/hwsupport/trim-devices.sh "$@"
54+
+exec /usr/sbin/hwsupport/trim-devices.sh "$@"
55+
diff --git a/usr/lib/hwsupport/format-sdcard.sh b/usr/lib/hwsupport/format-sdcard.sh
56+
index 3e13083..460c5dd 100755
57+
--- a/usr/lib/hwsupport/format-sdcard.sh
58+
+++ b/usr/lib/hwsupport/format-sdcard.sh
59+
@@ -1,3 +1,3 @@
60+
#!/usr/bin/sh
61+
62+
-exec /usr/lib/hwsupport/format-device.sh --device /dev/mmcblk0 "$@"
63+
+exec /usr/sbin/hwsupport/format-device.sh --device /dev/mmcblk0 "$@"

0 commit comments

Comments
 (0)