update to 2024.06, remove AVS files

Signed-off-by: Jaroslav Kysela <perex@perex.cz>

.gitignore

@@ -19,3 +19,11 @@
 /sof-bin-v2.2.3.tar.gz
 /sof-bin-v2.2.4.tar.gz
 /sof-bin-v2.2.5.tar.gz
+/sof-bin-v2.2.6.tar.gz
+/sof-bin-2023.09.tar.gz
+/sof-bin-2023.09.1.tar.gz
+/sof-bin-2023.09.2.tar.gz
+/sof-bin-2023.12.1.tar.gz
+/avs-topology_2024.02.tar.gz
+/sof-bin-2024.03.tar.gz
+/sof-bin-2024.06.tar.gz

alsa-sof-firmware.spec

@@ -4,10 +4,11 @@
 %global _firmwarepath  /usr/lib/firmware
 %global _xz_opts -9 --check=crc32
 
-%global sof_ver 2.2.5
+%global sof_ver 2024.06
 #global sof_ver_pre rc1
 %global sof_ver_rel %{?sof_ver_pre:.%{sof_ver_pre}}
-%global sof_ver_pkg v%{sof_ver}%{?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_pkg0}
 
 %global with_sof_addon 0
 %global sof_ver_addon 0
@@ -17,13 +18,13 @@
 Summary:        Firmware and topology files for Sound Open Firmware project
 Name:           alsa-sof-firmware
 Version:        %{sof_ver}
-Release:        3%{?sof_ver_rel}%{?dist}
+Release:        1%{?sof_ver_rel}%{?dist}
 # See later in the spec for a breakdown of licensing
-License:        BSD-3-Clause
+License:        BSD-3-Clause Apache-2.0
 URL:            https://github.com/thesofproject/sof-bin
-Source:         https://github.com/thesofproject/sof-bin/releases/download/%{sof_ver_pkg}/sof-bin-%{sof_ver_pkg}.tar.gz
+Source:         https://github.com/thesofproject/sof-bin/releases/download/%{sof_ver_pkg}/sof-bin-%{sof_ver_pkg0}.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
+Source3:        https://github.com/thesofproject/sof-bin/releases/download/v%{sof_ver_addon}/sof-tplg-v%{sof_ver_addon}.tar.gz
 %endif
 BuildRequires:  alsa-topology >= %{tplg_version}
 BuildRequires:  alsa-topology-utils >= %{tplg_version}
@@ -44,40 +45,45 @@ License:        BSD
 This package contains the debug files for the Sound Open Firmware project.
 
 %prep
-%autosetup -n sof-bin-%{sof_ver_pkg}
+%autosetup -n sof-bin-%{sof_ver_pkg0}
 
-mkdir -p firmware/intel/sof
+mkdir -p firmware/intel
 
-# we have the version in the package name
-mv sof-%{sof_ver_pkg}/* firmware/intel/sof
+for d in sof sof-ipc4 sof-ipc4-tplg sof-tplg; do \
+  mv "${d}" firmware/intel; \
+done
 
-# move topology files
-mv sof-tplg-%{sof_ver_pkg} firmware/intel/sof-tplg
+ln -s sof-ipc4-tplg firmware/intel/sof-ace-tplg
 
 %if 0%{?with_sof_addon}
-tar xvzf %{SOURCE2}
+tar xvzf %{SOURCE3}
 mv sof-tplg-v%{sof_ver_addon}/*.tplg firmware/intel/sof-tplg
 %endif
 
 # remove NXP firmware files
-rm LICENCE.NXP
+rm Notice.NXP LICENCE.NXP
 rm -rf firmware/intel/sof-tplg/sof-imx8*
 
 # remove Mediatek firmware files
 rm -rf firmware/intel/sof-tplg/sof-mt8*
 
 # use xz compression
-find -P firmware/intel/sof -type f -name "*.ri" -exec xz -z %{_xz_opts} {} \;
-for f in $(find -P firmware/intel/sof -type l -name "*.ri"); do \
-  l=$(readlink "${f}"); \
-  d=$(dirname "${f}"); \
-  b=$(basename "${f}"); \
-  rm "${f}"; \
-  pushd "${d}"; \
-  ln -svf "${l}.xz" "${b}.xz"; \
-  popd; \
+xz -z %{_xz_opts} manifest.txt
+for d in sof sof-ipc4; do \
+  find -P "firmware/intel/${d}" -type f -name "*.ri" -exec xz -z %{_xz_opts} {} \;
+  for f in $(find -P "firmware/intel/${d}" -type l -name "*.ri"); do \
+    l=$(readlink "${f}"); \
+    n=$(dirname "${f}"); \
+    b=$(basename "${f}"); \
+    rm "${f}"; \
+    pushd "${n}"; \
+    ln -svf "${l}.xz" "${b}.xz"; \
+    popd; \
+  done
+done
+for d in sof-tplg sof-ipc4-tplg; do \
+  find -P "firmware/intel/${d}"  -type f -name "*.tplg" -exec xz -z %{_xz_opts} {} \;
 done
-find -P firmware/intel/sof-tplg  -type f -name "*.tplg" -exec xz -z %{_xz_opts} {} \;
 
 %build
 # SST topology files (not SOF related, but it's a Intel hw support
@@ -108,6 +114,7 @@ cat alsa-sof-firmware.files
 %files -f alsa-sof-firmware.files
 %license LICENCE*
 %doc README*
+%doc manifest.txt.xz
 %dir %{_firmwarepath}
 
 # Licence: 3-clause BSD
@@ -116,6 +123,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
 
 # Licence: SOF (3-clause BSD plus others)
 # .. for files with suffix .ri
@@ -129,7 +138,40 @@ 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
+* Tue Sep  3 2024 Jaroslav Kysela <perex@perex.cz> - 2024.06-1
+- Update to v2024.06
+- Remove AVS topology files (linux-firmware is the main source now)
+
+* Wed Apr  3 2024 Jaroslav Kysela <perex@perex.cz> - 2024.03-2
+- Update to v2024.03
+
+* Tue Mar  5 2024 Jaroslav Kysela <perex@perex.cz> - 2023.12.1-1
+- Update to v2023.12.1
+- Add AVS topology files v2024.02
+
+* Wed Dec 20 2023 Jaroslav Kysela <perex@perex.cz> - 2023.12-1
+- Update to v2023.12
+
+* Thu Nov 16 2023 Jaroslav Kysela <perex@perex.cz> - 2023.09.2-1
+- Update to v2023.09.2
+
+* Mon Nov  6 2023 Jaroslav Kysela <perex@perex.cz> - 2023.09.1-1
+- Update to v2023.09.1
+
+* Tue Oct 24 2023 Jaroslav Kysela <perex@perex.cz> - 2023.09-1
+- Update to v2023.09
+
+* Wed Aug  9 2023 Jaroslav Kysela <perex@perex.cz> - 2.2.6-1
+- Update to v2.2.6
+
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (sof-bin-v2.2.5.tar.gz) = c8a5f846c6ca39b39c1160aaf8c607f301b4e153dadb337b0d3a99c5993a933948a2c2bd80950e6459da4d707c9a5100c11b868d11695bbb7ca56bf86f7fa9db
+SHA512 (sof-bin-2024.06.tar.gz) = 50dbd849b086158af88dd629566b80de4e841dd8a74b6ea8b1d99b3321be94a0d2d6f742b557f0445b9618a6dbeee3fec6a4e9822b320d511ede1ec1812c0d4d