From 1e291095c83cfe72dac168b59276a370f472f915 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 3 Sep 2024 16:54:14 +0200 Subject: [PATCH 1/8] update to 2024.06, remove AVS files Signed-off-by: Jaroslav Kysela --- .gitignore | 1 + alsa-sof-firmware.spec | 23 ++++++----------------- sources | 3 +-- 3 files changed, 8 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 60ef71c..5509e54 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /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 diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index a511843..5a42bcc 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 2024.06 #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: 1%{?sof_ver_rel}%{?dist} # See later in the spec for a breakdown of licensing 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_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 @@ -57,12 +55,6 @@ 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 @@ -92,9 +84,6 @@ 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 @@ -126,7 +115,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 +126,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 +146,10 @@ if st and st.type == "directory" then end %changelog +* 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..bb9d9ea 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-2024.06.tar.gz) = 50dbd849b086158af88dd629566b80de4e841dd8a74b6ea8b1d99b3321be94a0d2d6f742b557f0445b9618a6dbeee3fec6a4e9822b320d511ede1ec1812c0d4d From be46a612c49b4c4ed7f84dbc4667db9b2c52d441 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 27 Sep 2024 11:35:26 +0200 Subject: [PATCH 2/8] update to 2024.09 Signed-off-by: Jaroslav Kysela --- .gitignore | 1 + alsa-sof-firmware.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5509e54..c23927a 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /avs-topology_2024.02.tar.gz /sof-bin-2024.03.tar.gz /sof-bin-2024.06.tar.gz +/sof-bin-2024.09.tar.gz diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index 5a42bcc..3ababcf 100644 --- a/alsa-sof-firmware.spec +++ b/alsa-sof-firmware.spec @@ -4,7 +4,7 @@ %global _firmwarepath /usr/lib/firmware %global _xz_opts -9 --check=crc32 -%global sof_ver 2024.06 +%global sof_ver 2024.09 #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}} @@ -146,6 +146,9 @@ if st and st.type == "directory" then end %changelog +* 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) diff --git a/sources b/sources index bb9d9ea..a4a776c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sof-bin-2024.06.tar.gz) = 50dbd849b086158af88dd629566b80de4e841dd8a74b6ea8b1d99b3321be94a0d2d6f742b557f0445b9618a6dbeee3fec6a4e9822b320d511ede1ec1812c0d4d +SHA512 (sof-bin-2024.09.tar.gz) = b8a199afba7289a39485662741fbf8ecb47e9c91e461478e3e2d523c12986bfddf8a1f61b4ba0a2c689008de8808a2df00f05aacb541a2fb16a6a5dbd7481ecf From fb4dd41e119787ceae9b11f5e803e195a6bb63d8 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 11 Nov 2024 10:45:09 +0100 Subject: [PATCH 3/8] update to 2024.09.1 Signed-off-by: Jaroslav Kysela --- .gitignore | 1 + alsa-sof-firmware.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c23927a..ba3933a 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /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 diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index 3ababcf..09a84c6 100644 --- a/alsa-sof-firmware.spec +++ b/alsa-sof-firmware.spec @@ -4,7 +4,7 @@ %global _firmwarepath /usr/lib/firmware %global _xz_opts -9 --check=crc32 -%global sof_ver 2024.09 +%global sof_ver 2024.09.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}} @@ -146,6 +146,9 @@ if st and st.type == "directory" then end %changelog +* 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 diff --git a/sources b/sources index a4a776c..5eb12ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sof-bin-2024.09.tar.gz) = b8a199afba7289a39485662741fbf8ecb47e9c91e461478e3e2d523c12986bfddf8a1f61b4ba0a2c689008de8808a2df00f05aacb541a2fb16a6a5dbd7481ecf +SHA512 (sof-bin-2024.09.1.tar.gz) = e542ae732305485a4f12332f9bdec8d2e80ba41247e44e00960670b45970d45049f46fbdc42c9250ecc40bb1b9edaf1e81cd2c3da760f3bd174176ad3c8e22d2 From fe57b3305417523930b842a72d533bd386896d82 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 6 Dec 2024 09:40:45 +0100 Subject: [PATCH 4/8] update to 2024.09.2 Signed-off-by: Jaroslav Kysela --- .gitignore | 1 + alsa-sof-firmware.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ba3933a..0c16da2 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /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 diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index 09a84c6..cbc3fd3 100644 --- a/alsa-sof-firmware.spec +++ b/alsa-sof-firmware.spec @@ -4,7 +4,7 @@ %global _firmwarepath /usr/lib/firmware %global _xz_opts -9 --check=crc32 -%global sof_ver 2024.09.1 +%global sof_ver 2024.09.2 #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}} @@ -146,6 +146,9 @@ if st and st.type == "directory" then end %changelog +* 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 diff --git a/sources b/sources index 5eb12ae..bb40311 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sof-bin-2024.09.1.tar.gz) = e542ae732305485a4f12332f9bdec8d2e80ba41247e44e00960670b45970d45049f46fbdc42c9250ecc40bb1b9edaf1e81cd2c3da760f3bd174176ad3c8e22d2 +SHA512 (sof-bin-2024.09.2.tar.gz) = fadb9078705e0813897650e19166ad0d81710f8ba08ecb74de413a0bd7b27d73f9dcedd4583687f9deefd22ccb78b56ede8fbc5ab6fbd56e181c6b63be816a18 From 0befc5a67d81ce46c3c012431b282bc1da65b851 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 18 Dec 2024 10:00:10 +0100 Subject: [PATCH 5/8] add sof-ipc4-lib directory Signed-off-by: Jaroslav Kysela --- alsa-sof-firmware.spec | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index cbc3fd3..fcc6da3 100644 --- a/alsa-sof-firmware.spec +++ b/alsa-sof-firmware.spec @@ -18,7 +18,7 @@ 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 Apache-2.0 URL: https://github.com/thesofproject/sof-bin @@ -49,7 +49,7 @@ 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 @@ -79,7 +79,21 @@ 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} {} \; @@ -103,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 @@ -146,6 +162,9 @@ if st and st.type == "directory" then end %changelog +* 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 From da93de794018ea8b0ce48c0c5687cc9cb3db56f4 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 25 Feb 2025 11:27:09 +0100 Subject: [PATCH 6/8] update to 2025.01 Signed-off-by: Jaroslav Kysela --- .gitignore | 1 + alsa-sof-firmware.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0c16da2..8f518bf 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /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 diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index fcc6da3..edd791e 100644 --- a/alsa-sof-firmware.spec +++ b/alsa-sof-firmware.spec @@ -4,7 +4,7 @@ %global _firmwarepath /usr/lib/firmware %global _xz_opts -9 --check=crc32 -%global sof_ver 2024.09.2 +%global sof_ver 2025.01 #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}} @@ -18,7 +18,7 @@ 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 Apache-2.0 URL: https://github.com/thesofproject/sof-bin @@ -162,6 +162,9 @@ if st and st.type == "directory" then end %changelog +* Tue Feb 25 2025 Jaroslav Kysela - 2025.01-1 +- Update to v2025.01 + * Wed Dec 18 2024 Jaroslav Kysela - 2024.09.2-2 - Add sof-ipc4-lib directory diff --git a/sources b/sources index bb40311..06d630b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sof-bin-2024.09.2.tar.gz) = fadb9078705e0813897650e19166ad0d81710f8ba08ecb74de413a0bd7b27d73f9dcedd4583687f9deefd22ccb78b56ede8fbc5ab6fbd56e181c6b63be816a18 +SHA512 (sof-bin-2025.01.tar.gz) = 22f7b715121259df36658bf936e4abb9ae640296c5e296f58d7d6c45fa95ba31d198dabd80525bb71619c806319cfa6311fe11a5d41dd1ba82526de42cb59ba0 From b45619fd1b9f2849a22ae37b54a143228a29b8c9 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 3 Apr 2025 09:24:04 +0200 Subject: [PATCH 7/8] update to 2025.01.1 Signed-off-by: Jaroslav Kysela --- .gitignore | 1 + alsa-sof-firmware.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8f518bf..b2eaaad 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ /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 diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index edd791e..1c8674f 100644 --- a/alsa-sof-firmware.spec +++ b/alsa-sof-firmware.spec @@ -4,7 +4,7 @@ %global _firmwarepath /usr/lib/firmware %global _xz_opts -9 --check=crc32 -%global sof_ver 2025.01 +%global sof_ver 2025.01.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}} @@ -162,6 +162,9 @@ if st and st.type == "directory" then end %changelog +* 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 diff --git a/sources b/sources index 06d630b..569308b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sof-bin-2025.01.tar.gz) = 22f7b715121259df36658bf936e4abb9ae640296c5e296f58d7d6c45fa95ba31d198dabd80525bb71619c806319cfa6311fe11a5d41dd1ba82526de42cb59ba0 +SHA512 (sof-bin-2025.01.1.tar.gz) = 17aed645e22e2406b54a9a57800eade3c08f885a070b7eb363ef433b0d7e39cf2adf66c4e9d2ddf5325ce85de8f7680a82a0e7cec63513b65bba664b7b67b035 From 0a3ea2a7ff3e3ac8f2575fa1d6f3d79bb8b95757 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 24 Jun 2025 13:51:36 +0200 Subject: [PATCH 8/8] update to 2025.05 Signed-off-by: Jaroslav Kysela --- .gitignore | 1 + alsa-sof-firmware.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b2eaaad..6f683d9 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /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 diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index 1c8674f..de5d355 100644 --- a/alsa-sof-firmware.spec +++ b/alsa-sof-firmware.spec @@ -4,7 +4,7 @@ %global _firmwarepath /usr/lib/firmware %global _xz_opts -9 --check=crc32 -%global sof_ver 2025.01.1 +%global sof_ver 2025.05 #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}} @@ -162,6 +162,9 @@ if st and st.type == "directory" then end %changelog +* 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 diff --git a/sources b/sources index 569308b..0ae835e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sof-bin-2025.01.1.tar.gz) = 17aed645e22e2406b54a9a57800eade3c08f885a070b7eb363ef433b0d7e39cf2adf66c4e9d2ddf5325ce85de8f7680a82a0e7cec63513b65bba664b7b67b035 +SHA512 (sof-bin-2025.05.tar.gz) = 1bf01df094e58c7242e765b4f279f26c3138f68f908d5abf28262a5e5f7f36639a039477792574c5f5a40ce4dc44989bffb728a166379f82eab1386e1d0a5d16