diff --git a/spec_files/jupiter-hw-support/jupiter-hw-support.spec b/spec_files/jupiter-hw-support/jupiter-hw-support.spec index c6a54da7..0f5dbc71 100644 --- a/spec_files/jupiter-hw-support/jupiter-hw-support.spec +++ b/spec_files/jupiter-hw-support/jupiter-hw-support.spec @@ -41,16 +41,16 @@ export QA_RPATHS=0x0003 mkdir -p %{buildroot}%{_datadir}/ mkdir -p %{buildroot}%{_unitdir}/ mkdir -p %{buildroot}%{_bindir}/ -mkdir -p %{buildroot}%{_sbindir}/ +mkdir -p %{buildroot}%{_libexecdir}/ mkdir -p %{buildroot}%{_sysconfdir}/ mkdir -p %{buildroot}%{_prefix}/lib/hwsupport/ cp -rv usr/share/* %{buildroot}%{_datadir} cp -rv usr/lib/systemd/system/* %{buildroot}%{_unitdir}/ cp usr/lib/hwsupport/power-button-handler.py %{buildroot}%{_prefix}/lib/hwsupport/power-button-handler.py -cp usr/lib/hwsupport/format-device.sh %{buildroot}%{_sbindir}/format-device -cp usr/lib/hwsupport/format-sdcard.sh %{buildroot}%{_sbindir}/format-sdcard -cp usr/lib/hwsupport/steamos-automount.sh %{buildroot}%{_sbindir}/steamos-automount -cp usr/lib/hwsupport/trim-devices.sh %{buildroot}%{_sbindir}/trim-devices +cp usr/lib/hwsupport/format-device.sh %{buildroot}%{_libexecdir}/format-device +cp usr/lib/hwsupport/format-sdcard.sh %{buildroot}%{_libexecdir}/format-sdcard +cp usr/lib/hwsupport/steamos-automount.sh %{buildroot}%{_libexecdir}/steamos-automount +cp usr/lib/hwsupport/trim-devices.sh %{buildroot}%{_libexecdir}/trim-devices cp -rv usr/lib/udev %{buildroot}%{_prefix}/lib/udev cp -rv usr/bin/* %{buildroot}%{_bindir} cp -rv usr/lib/systemd/system/* %{buildroot}%{_unitdir} @@ -90,10 +90,10 @@ rm -rf %{buildroot}%{_unitdir}/multi-user.target.wants %{_bindir}/thumbstick_cal %{_bindir}/thumbstick_fine_cal %{_bindir}/trigger_cal -%{_sbindir}/format-device -%{_sbindir}/format-sdcard -%{_sbindir}/steamos-automount -%{_sbindir}/trim-devices +%{_libexecdir}/format-device +%{_libexecdir}/format-sdcard +%{_libexecdir}/steamos-automount +%{_libexecdir}/trim-devices %{_prefix}/lib/hwsupport/* %{_prefix}/lib/systemd/system/* %{_prefix}/lib/udev/rules.d/* diff --git a/spec_files/jupiter-hw-support/selinux.patch b/spec_files/jupiter-hw-support/selinux.patch index 408c50db..2c40f2ab 100644 --- a/spec_files/jupiter-hw-support/selinux.patch +++ b/spec_files/jupiter-hw-support/selinux.patch @@ -9,9 +9,9 @@ index e71a736..dd700da 100644 -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/steamos-automount add %i -+ExecStop=/usr/sbin/steamos-automount remove %i -+ExecReload=/usr/sbin/steamos-automount retrigger %i ++ExecStart=/usr/libexec/steamos-automount add %i ++ExecStop=/usr/libexec/steamos-automount remove %i ++ExecReload=/usr/libexec/steamos-automount retrigger %i diff --git a/usr/bin/steamos-polkit-helpers/jupiter-amp-control b/usr/bin/steamos-polkit-helpers/jupiter-amp-control index 3e0ed02..85bae6f 100755 --- a/usr/bin/steamos-polkit-helpers/jupiter-amp-control @@ -21,7 +21,7 @@ index 3e0ed02..85bae6f 100755 fi -exec /usr/lib/hwsupport/jupiter-amp-control "$@" -+exec /usr/sbin/jupiter-amp-control "$@" ++exec /usr/libexec/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..b8315a0 100755 --- a/usr/bin/steamos-polkit-helpers/steamos-format-device @@ -31,7 +31,7 @@ index dcfe6b9..b8315a0 100755 fi -exec /usr/lib/hwsupport/format-device.sh "$@" -+exec /usr/sbin/format-device "$@" ++exec /usr/libexec/format-device "$@" diff --git a/usr/bin/steamos-polkit-helpers/steamos-format-sdcard b/usr/bin/steamos-polkit-helpers/steamos-format-sdcard index 53b4f2a..9022762 100755 --- a/usr/bin/steamos-polkit-helpers/steamos-format-sdcard @@ -41,7 +41,7 @@ index 53b4f2a..9022762 100755 fi -exec /usr/lib/hwsupport/format-sdcard.sh "$@" -+exec /usr/sbin/format-sdcard "$@" ++exec /usr/libexec/format-sdcard "$@" diff --git a/usr/bin/steamos-polkit-helpers/steamos-trim-devices b/usr/bin/steamos-polkit-helpers/steamos-trim-devices index 296a6c7..698ee59 100755 --- a/usr/bin/steamos-polkit-helpers/steamos-trim-devices @@ -51,7 +51,7 @@ index 296a6c7..698ee59 100755 fi -exec /usr/lib/hwsupport/trim-devices.sh "$@" -+exec /usr/sbin/trim-devices "$@" ++exec /usr/libexec/trim-devices "$@" diff --git a/usr/lib/hwsupport/format-sdcard.sh b/usr/lib/hwsupport/format-sdcard.sh index 3e13083..39f08ac 100755 --- a/usr/lib/hwsupport/format-sdcard.sh @@ -60,7 +60,7 @@ index 3e13083..39f08ac 100755 #!/usr/bin/sh -exec /usr/lib/hwsupport/format-device.sh --device /dev/mmcblk0 "$@" -+exec /usr/sbin/format-device --device /dev/mmcblk0 "$@" ++exec /usr/libexec/format-device --device /dev/mmcblk0 "$@" diff --git a/usr/lib/hwsupport/jupiter-amp-control b/usr/lib/hwsupport/jupiter-amp-control index 68aa4e4..ff52e6f 100755 --- a/usr/lib/hwsupport/jupiter-amp-control