update to v2.1.1 + v2.1.1a (topology)

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

.gitignore

@@ -15,22 +15,3 @@
 /sof-tplg-v2.1.1a.tar.gz
 /alsa-sof-firmware-2.1.1-1.fc37.src.rpm
 /sof-bin-v2.1.1.tar.gz
-/sof-bin-v2.2.2.tar.gz
-/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
-/sof-bin-2024.09.tar.gz
-/sof-bin-2024.09.1.tar.gz
-/sof-bin-2024.09.2.tar.gz
-/sof-bin-2025.01.tar.gz
-/sof-bin-2025.01.1.tar.gz
-/sof-bin-2025.05.tar.gz
-/sof-bin-2025.05.1.tar.gz

alsa-sof-firmware.spec

@@ -4,27 +4,26 @@
 %global _firmwarepath  /usr/lib/firmware
 %global _xz_opts -9 --check=crc32
 
-%global sof_ver 2025.05.1
+%global sof_ver 2.1.1
 #global sof_ver_pre rc1
 %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_pkg0}
+%global sof_ver_pkg v%{sof_ver}%{?sof_ver_pre:-%{sof_ver_pre}}
 
-%global with_sof_addon 0
-%global sof_ver_addon 0
+%global with_sof_addon 1
+%global sof_ver_addon 2.1.1a
 
 %global tplg_version 1.2.4
 
 Summary:        Firmware and topology files for Sound Open Firmware project
 Name:           alsa-sof-firmware
 Version:        %{sof_ver}
-Release:        2%{?sof_ver_rel}%{?dist}
+Release:        1%{?sof_ver_rel}%{?dist}
 # See later in the spec for a breakdown of licensing
-License:        BSD-3-Clause AND Apache-2.0
+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}
-Source3:        https://github.com/thesofproject/sof-bin/releases/download/v%{sof_ver_addon}/sof-tplg-v%{sof_ver_addon}.tar.gz
+Source2:        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}
@@ -39,65 +38,46 @@ This package contains the firmware binaries for the Sound Open Firmware project.
 %package debug
 Requires:       alsa-sof-firmware
 Summary:        Debug files for Sound Open Firmware project
-License:        BSD-3-Clause
+License:        BSD
 
 %description debug
 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-ipc4-lib sof-ipc4-tplg sof-tplg; do \
-  mv "${d}" firmware/intel; \
-done
+# we have the version in the package name
+mv sof-%{sof_ver_pkg}/* firmware/intel/sof
 
-ln -s sof-ipc4-tplg firmware/intel/sof-ace-tplg
+# move topology files
+mv sof-tplg-%{sof_ver_pkg} firmware/intel/sof-tplg
 
 %if 0%{?with_sof_addon}
-tar xvzf %{SOURCE3}
+tar xvzf %{SOURCE2}
 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
 rm -rf firmware/intel/sof-tplg/sof-mt8*
 
 # use xz compression
-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-ipc4-lib; do \
-  for e in bin llext; do \
-    find -P "firmware/intel/${d}"  -type f -name "*.${e}" -exec xz -z %{_xz_opts} {} \;
-    for f in $(find -P "firmware/intel/${d}" -type l -name "*.${e}"); do \
-      l=$(readlink "${f}"); \
-      n=$(dirname "${f}"); \
-      b=$(basename "${f}"); \
-      rm "${f}"; \
-      pushd "${n}"; \
-      ln -svf "${l}.xz" "${b}.xz"; \
-      popd; \
-    done; \
-  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} {} \;
+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; \
 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
@@ -117,8 +97,6 @@ FILEDIR=$(pwd)
 pushd %{buildroot}/%{_firmwarepath}
 find -P . -name "*.ri.xz" | sed -e '/^.$/d' >> $FILEDIR/alsa-sof-firmware.files
 #find -P . -name "*.tplg" | sed -e '/^.$/d' >> $FILEDIR/alsa-sof-firmware.files
-find -P . -name "*.llext.xz" | sed -e '/^.$/d' >> $FILEDIR/alsa-sof-firmware.files
-find -P intel/sof-ipc4-lib -name "*.bin.xz" | sed -e '/^.$/d' >> $FILEDIR/alsa-sof-firmware.files
 find -P . -name "*.ldc" | sed -e '/^.$/d' > $FILEDIR/alsa-sof-firmware.debug-files
 find -P . -type d | sed -e '/^.$/d' > $FILEDIR/alsa-sof-firmware.dirs
 popd
@@ -130,7 +108,6 @@ 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
@@ -139,8 +116,6 @@ 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
@@ -154,126 +129,24 @@ 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 Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2025.05.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
-
-* Wed Aug 27 2025 Jaroslav Kysela <perex@perex.cz> - 2025.05.1-1
-- Update to v2025.05.1
-
-* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2025.05-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
-* Tue Jun 24 2025 Jaroslav Kysela <perex@perex.cz> - 2025.05-1
-- Update to v2025.05
-
-* Thu Apr  3 2025 Jaroslav Kysela <perex@perex.cz> - 2025.01.1-1
-- Update to v2025.01.1
-
-* Tue Feb 25 2025 Jaroslav Kysela <perex@perex.cz> - 2025.01-1
-- Update to v2025.01
-
-* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2024.09.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Wed Dec 18 2024 Jaroslav Kysela <perex@perex.cz> - 2024.09.2-2
-- Add sof-ipc4-lib directory
-
-* Fri Dec  6 2024 Jaroslav Kysela <perex@perex.cz> - 2024.09.2-1
-- Update to v2024.09.2
-
-* Mon Nov 11 2024 Jaroslav Kysela <perex@perex.cz> - 2024.09.1-1
-- Update to v2024.09.1
-
-* Fri Sep 27 2024 Jaroslav Kysela <perex@perex.cz> - 2024.09-1
-- Update to v2024.09
-
-* 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 Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2024.03-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* 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
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2023.12-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2023.12-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* 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
-
-* Tue Jun  6 2023 Jaroslav Kysela <perex@perex.cz> - 2.2.5-2
-- SPDX license
-
-* Mon May 15 2023 Jaroslav Kysela <perex@perex.cz> - 2.2.5-1
-- Update to v2.2.5
-
-* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Mon Jan  9 2023 Jaroslav Kysela <perex@perex.cz> - 2.2.4-2
-- Update to v2.2.4
-
-* Wed Dec  7 2022 Jaroslav Kysela <perex@perex.cz> - 2.2.3-1
-- Update to v2.2.3
-
-* Sat Sep 24 2022 Jaroslav Kysela <perex@perex.cz> - 2.2.2-1
-- Update to v2.2.2
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
 * Fri Jun 17 2022 Jaroslav Kysela <perex@perex.cz> - 2.1.1-1
 - Update to v2.1.1 + v2.1.1a (topology)
 
-* Fri Feb  4 2022 Jaroslav Kysela <perex@perex.cz> - 2.0-3
+* Fri Feb  4 2022 Jaroslav Kysela <perex@perex.cz> - 2.0-2
 - Use CRC32 for the xz compression
 
-* Thu Jan 27 2022 Jaroslav Kysela <perex@perex.cz> - 2.0-2
+* Thu Jan 27 2022 Jaroslav Kysela <perex@perex.cz> - 2.0-1
 - Update to v2.0
 - Use xz compression
 
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
 * Wed Dec 15 2021 Jaroslav Kysela <perex@perex.cz> - 1.9.3-1
 - Update to v1.9.3
 
 * Tue Nov 23 2021 Jaroslav Kysela <perex@perex.cz> - 1.9.2-1
 - Update to v1.9.2
 
-* Tue Oct  5 2021 Jaroslav Kysela <perex@perex.cz> - 1.9-2
+* Tue Oct  5 2021 Jaroslav Kysela <perex@perex.cz> - 1.9-1
 - Update to v1.9
 
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-2

sources

@@ -1 +1,2 @@
-SHA512 (sof-bin-2025.05.1.tar.gz) = ad255502c607e80dcd9d42f4b734e10534e7b2bc36b0cc077b825a75b91040a9094df1fb3b3bab3a87b99940009b99835357f22bc6289c52fb66f472459fe8e1
+SHA512 (sof-bin-v2.1.1.tar.gz) = 77e9562f67014d78b213fe428edef6a08dcc058a9a762da09a486c002c3aa0b907ea7c8ba6d4f88f5ddab5e564de06df9f2ed77206341a0fe2e1aaab1d9740ce
+SHA512 (sof-tplg-v2.1.1a.tar.gz) = 48f8aa8023313d44ddce6c5a2c9f9e9acdd3320b52e2718eaf949d030e79e8ea547e101374f59fd7492e763983af030a5ecfa3725c48e72cddfdefecb9421ece