From 2e61df3bfd97fe3a3a0a14c99d5f7a9986c2cac5 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 17 Jun 2024 09:38:55 +0200 Subject: [PATCH] Fix symlink issue (keep old directory name sof-ace-tplg) Resolves: RHEL-30564 Signed-off-by: Jaroslav Kysela --- alsa-sof-firmware.spec | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index 703197c..9adab09 100644 --- a/alsa-sof-firmware.spec +++ b/alsa-sof-firmware.spec @@ -19,7 +19,7 @@ Summary: Firmware and topology files for Sound Open Firmware project Name: alsa-sof-firmware Version: %{sof_ver} -Release: 4%{?sof_ver_rel}%{?dist} +Release: 5%{?sof_ver_rel}%{?dist} # See later in the spec for a breakdown of licensing License: BSD-3-Clause AND Apache-2.0 URL: https://github.com/thesofproject/sof-bin @@ -55,8 +55,6 @@ for d in sof sof-ipc4 sof-ipc4-tplg sof-tplg; do \ mv "${d}" firmware/intel; \ done -ln -s sof-ipc4-tplg firmware/intel/sof-ace-tplg - mkdir avs tar xvzf %{SOURCE2} --strip-components=1 --directory=avs mv avs/LICENSE LICENCE.avs @@ -96,6 +94,9 @@ for d in avs; do \ find -P "firmware/intel/${d}" -type f -name "*.bin" -exec xz -z %{_xz_opts} {} \; done +mv firmware/intel/sof-ipc4-tplg firmware/intel/sof-ace-tplg +ln -s sof-ace-tplg firmware/intel/sof-ipc4-tplg + %build # SST topology files (not SOF related, but it's a Intel hw support # and this package seems a good place to distribute them @@ -135,8 +136,8 @@ cat alsa-sof-firmware.files # Licence: 3-clause BSD # .. for files with suffix .tplg %{_firmwarepath}/intel/sof-tplg/*.tplg.xz -%{_firmwarepath}/intel/sof-ipc4-tplg/*.tplg.xz -%{_firmwarepath}/intel/sof-ace-tplg +%{_firmwarepath}/intel/sof-ace-tplg/*.tplg.xz +%{_firmwarepath}/intel/sof-ipc4-tplg # Licence: Apache 2.0 %{_firmwarepath}/intel/avs/*.bin.xz @@ -153,15 +154,8 @@ if st and st.type == "link" then os.remove(path) end -path1 = "%{_firmwarepath}/intel/sof-ace-tplg" -path2 = "%{_firmwarepath}/intel/sof-ipc4-tplg" -st = posix.stat(path1) -if st and st.type == "directory" then - os.rename(path1, path2) -end - %changelog -* Fri Jun 14 2024 Jaroslav Kysela - 2024.03-4 +* Mon Jun 17 2024 Jaroslav Kysela - 2024.03-5 - Update to v2024.03 - Add AVS topology files v2024.02