From 419639944ec5a1ac099de764d2f781b4a1f3f394 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Sun, 17 Dec 2023 13:36:54 -0800 Subject: [PATCH] chore: Move executable to libexec from usr/share/ --- spec_files/steamdeck-dsp/fedora.patch | 12 ++++++++++++ spec_files/steamdeck-dsp/steamdeck-dsp.spec | 6 +++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/spec_files/steamdeck-dsp/fedora.patch b/spec_files/steamdeck-dsp/fedora.patch index 594c3750..169dcc7e 100644 --- a/spec_files/steamdeck-dsp/fedora.patch +++ b/spec_files/steamdeck-dsp/fedora.patch @@ -83,3 +83,15 @@ index 48412ee..f0c5b82 100644 } ConflictingDevice [ ] +diff -Naur a/wireplumber/systemd/system/wireplumber-sysconf.service b/wireplumber/systemd/system/wireplumber-sysconf.service +--- a/wireplumber/systemd/system/wireplumber-sysconf.service ++++ b/wireplumber/systemd/system/wireplumber-sysconf.service +@@ -17,7 +17,7 @@ + [Service] + Type=oneshot + RemainAfterExit=yes +-ExecStart=/usr/share/wireplumber/hardware-profiles/wireplumber-hwconfig ++ExecStart=/usr/libexec/wireplumber-hwconfig + + [Install] + WantedBy=multi-user.target diff --git a/spec_files/steamdeck-dsp/steamdeck-dsp.spec b/spec_files/steamdeck-dsp/steamdeck-dsp.spec index 7de66c3b..134e667c 100644 --- a/spec_files/steamdeck-dsp/steamdeck-dsp.spec +++ b/spec_files/steamdeck-dsp/steamdeck-dsp.spec @@ -41,12 +41,17 @@ mkdir -p %{buildroot}%{_datadir}/licenses/%{name}/ cp LICENSE %{buildroot}%{_datadir}/licenses/%{name}/LICENSE xz --check=crc32 %{buildroot}%{_prefix}/lib/firmware/amd/sof/* xz --check=crc32 %{buildroot}%{_prefix}/lib/firmware/amd/sof-tplg/* +rm -f %{buildroot}%{_unitdir}/multi-user.target.wants/wireplumber-sysconf.service +rm -f %{buildroot}%{_sysconfdir}/wireplumber +mkdir -p %{buildroot}%{_libexecdir} +mv %{buildroot}%{_datadir}/wireplumber/hardware-profiles/wireplumber-hwconfig %{buildroot}%{_libexecdir}/wireplumber-hwconfig # This lists all the files that are included in the rpm package and that # are going to be installed into target system where the rpm is installed. %files %license LICENSE %{_prefix}/lib/firmware/amd/* +%{_libexecdir}/wireplumber-hwconfig %{_libdir}/lv2/svg/valve_deck_* %{_libdir}/lv2/valve_* %{_datadir}/alsa/ucm2/conf.d/acp5x/*.conf @@ -56,7 +61,6 @@ xz --check=crc32 %{buildroot}%{_prefix}/lib/firmware/amd/sof-tplg/* %{_datadir}/wireplumber/main.lua.d/*.lua %{_datadir}/wireplumber/scripts/*.lua %{_unitdir}/wireplumber-sysconf.service -%{_unitdir}/multi-user.target.wants/wireplumber-sysconf.service %post %systemd_post wireplumber-sysconf.service