mirror of
https://github.com/ublue-os/bazzite.git
synced 2025-03-29 22:20:21 +00:00
fix: Correct issues with selinux by moving files from /lib/hwsupport to /sbin/hwsupport in jupiter-hw-support packages.
This commit is contained in:
Kyle Gospodnetich
parent
1f03d05b97
commit
940d309b3e
@ -8,8 +8,9 @@ URL: https://github.com/ublue-os/bazzite
|
||||
|
||||
Source: https://gitlab.com/evlaV/%{packagename}/-/archive/master/%{packagename}-master.tar.gz
|
||||
Patch0: fedora.patch
|
||||
Patch1: https://gitlab.com/popsulfr/steamos-btrfs/-/raw/main/files/usr/lib/hwsupport/steamos-automount.sh.patch
|
||||
Patch2: https://gitlab.com/popsulfr/steamos-btrfs/-/raw/main/files/usr/lib/hwsupport/format-device.sh.patch
|
||||
Patch1: selinux.patch
|
||||
Patch2: https://gitlab.com/popsulfr/steamos-btrfs/-/raw/main/files/usr/lib/hwsupport/steamos-automount.sh.patch
|
||||
Patch3: https://gitlab.com/popsulfr/steamos-btrfs/-/raw/main/files/usr/lib/hwsupport/format-device.sh.patch
|
||||
|
||||
Requires: python3
|
||||
Requires: python3-libevdev
|
||||
@ -37,6 +38,7 @@ SteamOS 3.0 Steam Deck Hardware Support Package
|
||||
%patch 0 -p1
|
||||
%patch 1 -p1
|
||||
%patch 2 -p1
|
||||
%patch 3 -p1
|
||||
|
||||
%build
|
||||
|
||||
@ -45,10 +47,11 @@ export QA_RPATHS=0x0003
|
||||
mkdir -p %{buildroot}%{_datadir}/
|
||||
mkdir -p %{buildroot}%{_unitdir}/
|
||||
mkdir -p %{buildroot}%{_bindir}/
|
||||
mkdir -p %{buildroot}%{_sbindir}/
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/
|
||||
cp -rv usr/share/* %{buildroot}%{_datadir}
|
||||
cp -rv usr/lib/systemd/system/* %{buildroot}%{_unitdir}/
|
||||
cp -rv usr/lib/hwsupport %{buildroot}%{_prefix}/lib/hwsupport
|
||||
cp -rv usr/lib/hwsupport %{buildroot}%{_sbindir}/hwsupport
|
||||
cp -rv usr/lib/udev %{buildroot}%{_prefix}/lib/udev
|
||||
cp -rv usr/bin/* %{buildroot}%{_bindir}
|
||||
cp -rv usr/lib/systemd/system/* %{buildroot}%{_unitdir}
|
||||
@ -88,7 +91,7 @@ rm -rf %{buildroot}%{_unitdir}/multi-user.target.wants
|
||||
%{_bindir}/thumbstick_cal
|
||||
%{_bindir}/thumbstick_fine_cal
|
||||
%{_bindir}/trigger_cal
|
||||
%{_prefix}/lib/hwsupport/*
|
||||
%{_sbindir}/hwsupport/*
|
||||
%{_prefix}/lib/systemd/system/*
|
||||
%{_prefix}/lib/udev/rules.d/*
|
||||
%{_datadir}/alsa/ucm2/conf.d/acp5x/*
|
||||
|
||||
@ -7,6 +7,7 @@ URL: https://github.com/ublue-os/bazzite
|
||||
|
||||
Source: https://gitlab.com/evlaV/%{name}/-/archive/master/%{name}-master.tar.gz
|
||||
Patch0: fedora.patch
|
||||
Patch1: selinux.patch
|
||||
|
||||
Requires: python3
|
||||
Requires: python3-libevdev
|
||||
@ -32,6 +33,7 @@ SteamOS 3.0 Steam Deck Hardware Support Package
|
||||
%prep
|
||||
%setup -n %{name}-master
|
||||
%patch 0 -p1
|
||||
%patch 1 -p1
|
||||
|
||||
%build
|
||||
|
||||
@ -40,10 +42,11 @@ export QA_RPATHS=0x0003
|
||||
mkdir -p %{buildroot}%{_datadir}/
|
||||
mkdir -p %{buildroot}%{_unitdir}/
|
||||
mkdir -p %{buildroot}%{_bindir}/
|
||||
mkdir -p %{buildroot}%{_sbindir}/
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/
|
||||
cp -rv usr/share/* %{buildroot}%{_datadir}
|
||||
cp -rv usr/lib/systemd/system/* %{buildroot}%{_unitdir}/
|
||||
cp -rv usr/lib/hwsupport %{buildroot}%{_prefix}/lib/hwsupport
|
||||
cp -rv usr/lib/hwsupport %{buildroot}%{_sbindir}/hwsupport
|
||||
cp -rv usr/lib/udev %{buildroot}%{_prefix}/lib/udev
|
||||
cp -rv usr/bin/* %{buildroot}%{_bindir}
|
||||
cp -rv usr/lib/systemd/system/* %{buildroot}%{_unitdir}
|
||||
@ -83,7 +86,7 @@ rm -rf %{buildroot}%{_unitdir}/multi-user.target.wants
|
||||
%{_bindir}/thumbstick_cal
|
||||
%{_bindir}/thumbstick_fine_cal
|
||||
%{_bindir}/trigger_cal
|
||||
%{_prefix}/lib/hwsupport/*
|
||||
%{_sbindir}/hwsupport/*
|
||||
%{_prefix}/lib/systemd/system/*
|
||||
%{_prefix}/lib/udev/rules.d/*
|
||||
%{_datadir}/alsa/ucm2/conf.d/acp5x/*
|
||||
|
||||
63
spec_files/jupiter-hw-support/selinux.patch
Normal file
63
spec_files/jupiter-hw-support/selinux.patch
Normal file
@ -0,0 +1,63 @@
|
||||
diff --git a/etc/systemd/system/steamos-automount@.service b/etc/systemd/system/steamos-automount@.service
|
||||
index e71a736..8fe8aca 100644
|
||||
--- a/etc/systemd/system/steamos-automount@.service
|
||||
+++ b/etc/systemd/system/steamos-automount@.service
|
||||
@@ -14,6 +14,6 @@ Description=Mount removable drive %i and notify Steam
|
||||
[Service]
|
||||
Type=oneshot
|
||||
RemainAfterExit=true
|
||||
-ExecStart=/usr/lib/hwsupport/steamos-automount.sh add %i
|
||||
-ExecStop=/usr/lib/hwsupport/steamos-automount.sh remove %i
|
||||
-ExecReload=/usr/lib/hwsupport/steamos-automount.sh retrigger %i
|
||||
+ExecStart=/usr/sbin/hwsupport/steamos-automount.sh add %i
|
||||
+ExecStop=/usr/sbin/hwsupport/steamos-automount.sh remove %i
|
||||
+ExecReload=/usr/sbin/hwsupport/steamos-automount.sh retrigger %i
|
||||
diff --git a/usr/bin/steamos-polkit-helpers/jupiter-amp-control b/usr/bin/steamos-polkit-helpers/jupiter-amp-control
|
||||
index 3e0ed02..ed132dd 100755
|
||||
--- a/usr/bin/steamos-polkit-helpers/jupiter-amp-control
|
||||
+++ b/usr/bin/steamos-polkit-helpers/jupiter-amp-control
|
||||
@@ -7,4 +7,4 @@ then
|
||||
exec pkexec --disable-internal-agent "$0" "$@"
|
||||
fi
|
||||
|
||||
-exec /usr/lib/hwsupport/jupiter-amp-control "$@"
|
||||
+exec /usr/sbin/hwsupport/jupiter-amp-control "$@"
|
||||
diff --git a/usr/bin/steamos-polkit-helpers/steamos-format-device b/usr/bin/steamos-polkit-helpers/steamos-format-device
|
||||
index dcfe6b9..f3a7129 100755
|
||||
--- a/usr/bin/steamos-polkit-helpers/steamos-format-device
|
||||
+++ b/usr/bin/steamos-polkit-helpers/steamos-format-device
|
||||
@@ -8,4 +8,4 @@ then
|
||||
exec pkexec --disable-internal-agent "$0" --owner "$UID":"$gid" "$@"
|
||||
fi
|
||||
|
||||
-exec /usr/lib/hwsupport/format-device.sh "$@"
|
||||
+exec /usr/sbin/hwsupport/format-device.sh "$@"
|
||||
diff --git a/usr/bin/steamos-polkit-helpers/steamos-format-sdcard b/usr/bin/steamos-polkit-helpers/steamos-format-sdcard
|
||||
index 53b4f2a..4298a52 100755
|
||||
--- a/usr/bin/steamos-polkit-helpers/steamos-format-sdcard
|
||||
+++ b/usr/bin/steamos-polkit-helpers/steamos-format-sdcard
|
||||
@@ -8,4 +8,4 @@ then
|
||||
exec pkexec --disable-internal-agent "$0" --owner "$UID":"$gid" "$@"
|
||||
fi
|
||||
|
||||
-exec /usr/lib/hwsupport/format-sdcard.sh "$@"
|
||||
+exec /usr/sbin/hwsupport/format-sdcard.sh "$@"
|
||||
diff --git a/usr/bin/steamos-polkit-helpers/steamos-trim-devices b/usr/bin/steamos-polkit-helpers/steamos-trim-devices
|
||||
index 296a6c7..c382047 100755
|
||||
--- a/usr/bin/steamos-polkit-helpers/steamos-trim-devices
|
||||
+++ b/usr/bin/steamos-polkit-helpers/steamos-trim-devices
|
||||
@@ -7,4 +7,4 @@ then
|
||||
exec pkexec --disable-internal-agent "$0" "$@"
|
||||
fi
|
||||
|
||||
-exec /usr/lib/hwsupport/trim-devices.sh "$@"
|
||||
+exec /usr/sbin/hwsupport/trim-devices.sh "$@"
|
||||
diff --git a/usr/lib/hwsupport/format-sdcard.sh b/usr/lib/hwsupport/format-sdcard.sh
|
||||
index 3e13083..460c5dd 100755
|
||||
--- a/usr/lib/hwsupport/format-sdcard.sh
|
||||
+++ b/usr/lib/hwsupport/format-sdcard.sh
|
||||
@@ -1,3 +1,3 @@
|
||||
#!/usr/bin/sh
|
||||
|
||||
-exec /usr/lib/hwsupport/format-device.sh --device /dev/mmcblk0 "$@"
|
||||
+exec /usr/sbin/hwsupport/format-device.sh --device /dev/mmcblk0 "$@"
|
||||
Loading…
x
Reference in New Issue
Block a user