diff --git a/.gitignore b/.gitignore index 60ef71c..921bfba 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,11 @@ /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 diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index a511843..f31a42c 100644 --- a/alsa-sof-firmware.spec +++ b/alsa-sof-firmware.spec @@ -4,8 +4,7 @@ %global _firmwarepath /usr/lib/firmware %global _xz_opts -9 --check=crc32 -%global sof_ver 2024.03 -%global sof_ver_avs 2024.02 +%global sof_ver 2025.05.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}} @@ -19,12 +18,11 @@ Summary: Firmware and topology files for Sound Open Firmware project Name: alsa-sof-firmware Version: %{sof_ver} -Release: 3%{?sof_ver_rel}%{?dist} +Release: 2%{?sof_ver_rel}%{?dist} # See later in the spec for a breakdown of licensing -License: BSD-3-Clause Apache-2.0 +License: BSD-3-Clause AND 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_pkg0}.tar.gz -Source2: https://github.com/thesofproject/avs-topology-xml/releases/download/v%{sof_ver_avs}/avs-topology_%{sof_ver_avs}.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 %endif @@ -41,7 +39,7 @@ 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 +License: BSD-3-Clause %description debug This package contains the debug files for the Sound Open Firmware project. @@ -51,18 +49,12 @@ This package contains the debug files for the Sound Open Firmware project. mkdir -p firmware/intel -for d in sof sof-ipc4 sof-ipc4-tplg sof-tplg; do \ +for d in sof sof-ipc4 sof-ipc4-lib 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 -mv avs/lib/firmware/intel/avs firmware/intel -echo "%{sof_ver_avs}" > manifest.avs.txt - %if 0%{?with_sof_addon} tar xvzf %{SOURCE3} mv sof-tplg-v%{sof_ver_addon}/*.tplg firmware/intel/sof-tplg @@ -87,14 +79,25 @@ for d in sof sof-ipc4; do \ pushd "${n}"; \ ln -svf "${l}.xz" "${b}.xz"; \ popd; \ - done + 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} {} \; done -for d in avs; do \ - find -P "firmware/intel/${d}" -type f -name "*.bin" -exec xz -z %{_xz_opts} {} \; -done %build # SST topology files (not SOF related, but it's a Intel hw support @@ -114,6 +117,8 @@ 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 @@ -126,7 +131,6 @@ cat alsa-sof-firmware.files %license LICENCE* %doc README* %doc manifest.txt.xz -%doc manifest.avs.txt %dir %{_firmwarepath} # Licence: 3-clause BSD @@ -138,9 +142,6 @@ cat alsa-sof-firmware.files %{_firmwarepath}/intel/sof-ipc4-tplg/*.tplg.xz %{_firmwarepath}/intel/sof-ace-tplg -# Licence: Apache 2.0 -%{_firmwarepath}/intel/avs/*.bin.xz - # Licence: SOF (3-clause BSD plus others) # .. for files with suffix .ri @@ -161,6 +162,43 @@ if st and st.type == "directory" then end %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 2025.05.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Wed Aug 27 2025 Jaroslav Kysela - 2025.05.1-1 +- Update to v2025.05.1 + +* Wed Jul 23 2025 Fedora Release Engineering - 2025.05-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Tue Jun 24 2025 Jaroslav Kysela - 2025.05-1 +- Update to v2025.05 + +* Thu Apr 3 2025 Jaroslav Kysela - 2025.01.1-1 +- Update to v2025.01.1 + +* Tue Feb 25 2025 Jaroslav Kysela - 2025.01-1 +- Update to v2025.01 + +* Thu Jan 16 2025 Fedora Release Engineering - 2024.09.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Wed Dec 18 2024 Jaroslav Kysela - 2024.09.2-2 +- Add sof-ipc4-lib directory + +* Fri Dec 6 2024 Jaroslav Kysela - 2024.09.2-1 +- Update to v2024.09.2 + +* Mon Nov 11 2024 Jaroslav Kysela - 2024.09.1-1 +- Update to v2024.09.1 + +* Fri Sep 27 2024 Jaroslav Kysela - 2024.09-1 +- Update to v2024.09 + +* Tue Sep 3 2024 Jaroslav Kysela - 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 - 2024.03-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index e67be8d..f2359d1 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (sof-bin-2024.03.tar.gz) = 1e9891d3891f5a4413a77a68ea6d3a2e6ead8c1a67eaa7e9aaf30871753617ffce19bd3b85ebcbb617e606646f6aa0e1dafee5279c294ec72ef4b2885e009f72 -SHA512 (avs-topology_2024.02.tar.gz) = b7ebce9a6893e44d3c4a41c8e15818f7dac9d3e246c724e9a48514e40e6c43f1791a947b4560fe5ce6eb135232bf5ea8fb1a4d84f83442b7c777e341c977e134 +SHA512 (sof-bin-2025.05.1.tar.gz) = ad255502c607e80dcd9d42f4b734e10534e7b2bc36b0cc077b825a75b91040a9094df1fb3b3bab3a87b99940009b99835357f22bc6289c52fb66f472459fe8e1