From e3a78371f3274232ff942ebd2041e1182dd7e910 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Sat, 24 Sep 2022 10:05:16 +0200 Subject: [PATCH 1/7] update to v2.2.2 Signed-off-by: Jaroslav Kysela --- .gitignore | 1 + alsa-sof-firmware.spec | 11 +++++++---- sources | 3 +-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 334e4a2..b362f29 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /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 diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index 6deb4ad..b91a49f 100644 --- a/alsa-sof-firmware.spec +++ b/alsa-sof-firmware.spec @@ -4,20 +4,20 @@ %global _firmwarepath /usr/lib/firmware %global _xz_opts -9 --check=crc32 -%global sof_ver 2.1.1 +%global sof_ver 2.2.2 #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 with_sof_addon 1 -%global sof_ver_addon 2.1.1a +%global with_sof_addon 0 +%global sof_ver_addon 0 %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 URL: https://github.com/thesofproject/sof-bin @@ -130,6 +130,9 @@ if st and st.type == "link" then end %changelog +* Sat Sep 24 2022 Jaroslav Kysela - 2.2.2-1 +- Update to v2.2.2 + * Wed Jul 20 2022 Fedora Release Engineering - 2.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index c765245..25def1a 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (sof-bin-v2.1.1.tar.gz) = 77e9562f67014d78b213fe428edef6a08dcc058a9a762da09a486c002c3aa0b907ea7c8ba6d4f88f5ddab5e564de06df9f2ed77206341a0fe2e1aaab1d9740ce -SHA512 (sof-tplg-v2.1.1a.tar.gz) = 48f8aa8023313d44ddce6c5a2c9f9e9acdd3320b52e2718eaf949d030e79e8ea547e101374f59fd7492e763983af030a5ecfa3725c48e72cddfdefecb9421ece +SHA512 (sof-bin-v2.2.2.tar.gz) = 6a3be7088f8a93a052563e040a588c600512d08d4b75ae5567db255e334997a6401d41863dcb416562eee07fef0bd2abe1d9d0403cd236ab007474f66271db50 From 489ed093d920850fa9bba7fc401c33c8ee3a56b6 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 7 Dec 2022 08:46:42 +0100 Subject: [PATCH 2/7] update to v2.2.3 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 b362f29..971f332 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /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 diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index b91a49f..e39bf18 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 2.2.2 +%global sof_ver 2.2.3 #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}} @@ -130,6 +130,9 @@ if st and st.type == "link" then end %changelog +* Wed Dec 7 2022 Jaroslav Kysela - 2.2.3-1 +- Update to v2.2.3 + * Sat Sep 24 2022 Jaroslav Kysela - 2.2.2-1 - Update to v2.2.2 diff --git a/sources b/sources index 25def1a..aca07ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sof-bin-v2.2.2.tar.gz) = 6a3be7088f8a93a052563e040a588c600512d08d4b75ae5567db255e334997a6401d41863dcb416562eee07fef0bd2abe1d9d0403cd236ab007474f66271db50 +SHA512 (sof-bin-v2.2.3.tar.gz) = c4e345d0932d1c607072feea41acf2f3a5b3694b0c468515a28889b6d0ba46775f91ef9edf91a321a3be056705dc8b4df9c836096c2e73063afcbc166ca10abc From e24af9dad4f2860e6861d2c48cffbd91a1f93d45 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 9 Jan 2023 10:33:09 +0100 Subject: [PATCH 3/7] update to v2.2.4 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 971f332..66bb13d 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /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 diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index e39bf18..3f3521a 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 2.2.3 +%global sof_ver 2.2.4 #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}} @@ -130,6 +130,9 @@ if st and st.type == "link" then end %changelog +* Mon Jan 9 2022 Jaroslav Kysela - 2.2.4-1 +- Update to v2.2.4 + * Wed Dec 7 2022 Jaroslav Kysela - 2.2.3-1 - Update to v2.2.3 diff --git a/sources b/sources index aca07ba..f82d02f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sof-bin-v2.2.3.tar.gz) = c4e345d0932d1c607072feea41acf2f3a5b3694b0c468515a28889b6d0ba46775f91ef9edf91a321a3be056705dc8b4df9c836096c2e73063afcbc166ca10abc +SHA512 (sof-bin-v2.2.4.tar.gz) = f631bedbc5cceb0e3a668264c11f4e41f09f140ef909ac2557c4965a0b56deb00fa48ab06987fd2fd06eb97a35bc90342c5d7234d43390257bbd0942a70ce29a From cde0832e9e1a248db2ba3df016ffed9881acc50c Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 9 Jan 2023 10:40:35 +0100 Subject: [PATCH 4/7] fix date --- alsa-sof-firmware.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index 3f3521a..10b557e 100644 --- a/alsa-sof-firmware.spec +++ b/alsa-sof-firmware.spec @@ -17,7 +17,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 URL: https://github.com/thesofproject/sof-bin @@ -130,7 +130,7 @@ if st and st.type == "link" then end %changelog -* Mon Jan 9 2022 Jaroslav Kysela - 2.2.4-1 +* Mon Jan 9 2023 Jaroslav Kysela - 2.2.4-2 - Update to v2.2.4 * Wed Dec 7 2022 Jaroslav Kysela - 2.2.3-1 From c802b54654ecfe1e91e8c8b60b0f9916415db864 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 15 May 2023 08:14:12 +0200 Subject: [PATCH 5/7] update to v2.2.5 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 66bb13d..16736ac 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /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 diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index 10b557e..518ba09 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 2.2.4 +%global sof_ver 2.2.5 #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}} @@ -17,7 +17,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 URL: https://github.com/thesofproject/sof-bin @@ -130,6 +130,9 @@ if st and st.type == "link" then end %changelog +* Mon May 15 2023 Jaroslav Kysela - 2.2.5-1 +- Update to v2.2.5 + * Mon Jan 9 2023 Jaroslav Kysela - 2.2.4-2 - Update to v2.2.4 diff --git a/sources b/sources index f82d02f..27b8931 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sof-bin-v2.2.4.tar.gz) = f631bedbc5cceb0e3a668264c11f4e41f09f140ef909ac2557c4965a0b56deb00fa48ab06987fd2fd06eb97a35bc90342c5d7234d43390257bbd0942a70ce29a +SHA512 (sof-bin-v2.2.5.tar.gz) = c8a5f846c6ca39b39c1160aaf8c607f301b4e153dadb337b0d3a99c5993a933948a2c2bd80950e6459da4d707c9a5100c11b868d11695bbb7ca56bf86f7fa9db From b2c081fd480b5f41d3a1af8dad20b53d043ef41d Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 24 Oct 2023 10:03:49 +0200 Subject: [PATCH 6/7] update to v2023.09 Signed-off-by: Jaroslav Kysela --- .gitignore | 2 ++ alsa-sof-firmware.spec | 54 +++++++++++++++++++++++++----------------- sources | 2 +- 3 files changed, 35 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 16736ac..5a34694 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,5 @@ /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 diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index 518ba09..0b9f5b8 100644 --- a/alsa-sof-firmware.spec +++ b/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 2023.09 #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 @@ -19,9 +20,9 @@ Name: alsa-sof-firmware Version: %{sof_ver} Release: 1%{?sof_ver_rel}%{?dist} # See later in the spec for a breakdown of licensing -License: BSD +License: BSD-3-Clause 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 %endif @@ -44,15 +45,13 @@ 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 - -# move topology files -mv sof-tplg-%{sof_ver_pkg} firmware/intel/sof-tplg +for d in sof sof-ipc4 sof-ace-tplg sof-tplg; do \ + mv "${d}" firmware/intel; \ +done %if 0%{?with_sof_addon} tar xvzf %{SOURCE2} @@ -60,24 +59,29 @@ 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-ace-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 +112,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 +121,7 @@ cat alsa-sof-firmware.files # Licence: 3-clause BSD # .. for files with suffix .tplg %{_firmwarepath}/intel/sof-tplg/*.tplg.xz +%{_firmwarepath}/intel/sof-ace-tplg/*.tplg.xz # Licence: SOF (3-clause BSD plus others) # .. for files with suffix .ri @@ -130,6 +136,10 @@ if st and st.type == "link" then end %changelog +* Tue Oct 24 2023 Jaroslav Kysela - 2023.09-1 +- Update to v2023.09 +- SPDX license + * Mon May 15 2023 Jaroslav Kysela - 2.2.5-1 - Update to v2.2.5 diff --git a/sources b/sources index 27b8931..0cb8e26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sof-bin-v2.2.5.tar.gz) = c8a5f846c6ca39b39c1160aaf8c607f301b4e153dadb337b0d3a99c5993a933948a2c2bd80950e6459da4d707c9a5100c11b868d11695bbb7ca56bf86f7fa9db +SHA512 (sof-bin-2023.09.tar.gz) = 7ef81549c76164629400622fa1b512b6061a37b9ba14383d69ac10b2e7dc35c4f35bd6444b15e725c749c23564ec84646960fedcd776b5c2ec11bda3933a633d From 8f7da97836ef995e10a75363c41a041d5583e45a Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 6 Nov 2023 09:17:49 +0100 Subject: [PATCH 7/7] update to v2023.09.1 Signed-off-by: Jaroslav Kysela --- .gitignore | 1 + alsa-sof-firmware.spec | 5 ++++- sources | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 5a34694..c520a8f 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /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 diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index 0b9f5b8..f2a3503 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 2023.09 +%global sof_ver 2023.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}} @@ -136,6 +136,9 @@ if st and st.type == "link" then end %changelog +* Mon Nov 6 2023 Jaroslav Kysela - 2023.09.1-1 +- Update to v2023.09.1 + * Tue Oct 24 2023 Jaroslav Kysela - 2023.09-1 - Update to v2023.09 - SPDX license diff --git a/sources b/sources index 0cb8e26..715c319 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (sof-bin-2023.09.tar.gz) = 7ef81549c76164629400622fa1b512b6061a37b9ba14383d69ac10b2e7dc35c4f35bd6444b15e725c749c23564ec84646960fedcd776b5c2ec11bda3933a633d +SHA512 (sof-bin-2023.09.1.tar.gz) = 74a0de0cfc561a273f2f535239a5e23a3bdd7718c1f70e320cf11b58ff499ff437f98aab3171901165d3da4156b4374f5e4259bee152f7d10755b69e98b8ba51