.alsa-sof-firmware.metadata

@@ -0,0 +1,2 @@
+3aef419f1d2ddf360b7757214c21cbef7aabadc8 SOURCES/skl_hda_dsp_generic-tplg.bin
+2a5336a8c5ced0e8bb9ba5237a52e7ac37833b13 SOURCES/sof-bin-v2.2.4.tar.gz

.gitignore

@@ -1,2 +1,2 @@
 SOURCES/skl_hda_dsp_generic-tplg.bin
-SOURCES/sof-bin-2023.09.2.tar.gz
+SOURCES/sof-bin-v2.2.4.tar.gz

SPECS/alsa-sof-firmware.spec

@@ -3,11 +3,10 @@
 %define _binaries_in_noarch_packages_terminate_build   0
 %global _firmwarepath  /usr/lib/firmware
 
-%global sof_ver 2023.09.2
+%global sof_ver 2.2.4
-#global sof_ver_pre rc1
+#global sof_ver_pre rc2
 %global sof_ver_rel %{?sof_ver_pre:.%{sof_ver_pre}}
-%global sof_ver_pkg0 %{sof_ver}%{?sof_ver_pre:-%{sof_ver_pre}}
+%global sof_ver_pkg v%{sof_ver}%{?sof_ver_pre:-%{sof_ver_pre}}
-%global sof_ver_pkg v%{sof_ver_pkg0}
 
 %global with_sof_addon 0
 %global sof_ver_addon 0
@@ -17,11 +16,11 @@
 Summary:        Firmware and topology files for Sound Open Firmware project
 Name:           alsa-sof-firmware
 Version:        %{sof_ver}
-Release:        1%{?sof_ver_rel}%{?dist}
+Release:        2%{?sof_ver_rel}%{?dist}
 # See later in the spec for a breakdown of licensing
-License:        BSD-3-Clause
+License:        BSD
 URL:            https://github.com/thesofproject/sof-bin
-Source:         https://github.com/thesofproject/sof-bin/releases/download/%{sof_ver_pkg}/sof-bin-%{sof_ver_pkg0}.tar.gz
+Source:         https://github.com/thesofproject/sof-bin/releases/download/%{sof_ver_pkg}/sof-bin-%{sof_ver_pkg}.tar.gz
 %if 0%{?with_sof_addon}
 Source2:        https://github.com/thesofproject/sof-bin/releases/download/v%{sof_ver_addon}/sof-tplg-v%{sof_ver_addon}.tar.gz
 %endif
@@ -42,13 +41,15 @@ License:        BSD
 This package contains the debug files for the Sound Open Firmware project.
 
 %prep
-%autosetup -n sof-bin-%{sof_ver_pkg0}
+%autosetup -n sof-bin-%{sof_ver_pkg}
 
-mkdir -p firmware/intel
+mkdir -p firmware/intel/sof
 
-for d in sof sof-ipc4 sof-ace-tplg sof-tplg; do \
+# we have the version in the package name
-  mv "${d}" firmware/intel; \
+mv sof-%{sof_ver_pkg}/* firmware/intel/sof
-done
+
+# move topology files
+mv sof-tplg-%{sof_ver_pkg} firmware/intel/sof-tplg
 
 %if 0%{?with_sof_addon}
 tar xvzf %{SOURCE2}
@@ -56,7 +57,7 @@ mv sof-tplg-v%{sof_ver_addon}/*.tplg firmware/intel/sof-tplg
 %endif
 
 # remove NXP firmware files
-rm Notice.NXP LICENCE.NXP
+rm LICENCE.NXP
 rm -rf firmware/intel/sof-tplg/sof-imx8*
 
 # remove Mediatek firmware files
@@ -88,7 +89,6 @@ cat alsa-sof-firmware.files
 %files -f alsa-sof-firmware.files
 %license LICENCE*
 %doc README*
-%doc manifest.txt
 %dir %{_firmwarepath}
 
 # Licence: 3-clause BSD
@@ -96,8 +96,7 @@ cat alsa-sof-firmware.files
 
 # Licence: 3-clause BSD
 # .. for files with suffix .tplg
-%{_firmwarepath}/intel/sof-tplg/*.tplg
+%{_firmwarepath}/intel/sof-tplg
-%{_firmwarepath}/intel/sof-ace-tplg/*.tplg
 
 # Licence: SOF (3-clause BSD plus others)
 # .. for files with suffix .ri
@@ -105,13 +104,6 @@ cat alsa-sof-firmware.files
 %files debug -f alsa-sof-firmware.debug-files
 
 %changelog
-* Thu Nov  16 2023 Jaroslav Kysela <perex@perex.cz> - 2023.09.1-2
-- Update to v2023.09.2
-- SPDX license
-
-* Mon May 15 2023 Jaroslav Kysela <perex@perex.cz> - 2.2.5-1
-- Update to v2.2.5
-
 * Mon Jan  9 2023 Jaroslav Kysela <perex@perex.cz> - 2.2.4-2
 - Update to v2.2.4