From 371b74deb9f773817c6f60c194bc5a8e00db7a9f Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 15 May 2023 08:14:12 +0200 Subject: [PATCH 1/5] 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 02bbadf..55b9950 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: 3%{?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 + * Wed Jan 18 2023 Fedora Release Engineering - 2.2.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild 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 17293a41d1531c396893c1d77c51672a53738b1d Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 24 Oct 2023 10:03:49 +0200 Subject: [PATCH 2/5] 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 55b9950..eb3e928 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 eb8fafeccd36ff9b607484020bc20f1e9301970e Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Mon, 6 Nov 2023 09:17:49 +0100 Subject: [PATCH 3/5] 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 eb3e928..f10357b 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 From a72dca62339910ee36df05c8f7d118607303de94 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 16 Nov 2023 15:20:24 +0100 Subject: [PATCH 4/5] update to v2023.09.2 Signed-off-by: Jaroslav Kysela --- .gitignore | 1 + alsa-sof-firmware.spec | 5 ++++- sources | 3 +-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c520a8f..9a1367c 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /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 diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index f10357b..0ba9a27 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.1 +%global sof_ver 2023.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}} @@ -136,6 +136,9 @@ if st and st.type == "link" then end %changelog +* Thu Nov 16 2023 Jaroslav Kysela - 2023.09.2-1 +- Update to v2023.09.2 + * Mon Nov 6 2023 Jaroslav Kysela - 2023.09.1-1 - Update to v2023.09.1 diff --git a/sources b/sources index 715c319..a8ad7a8 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (sof-bin-2023.09.tar.gz) = 7ef81549c76164629400622fa1b512b6061a37b9ba14383d69ac10b2e7dc35c4f35bd6444b15e725c749c23564ec84646960fedcd776b5c2ec11bda3933a633d -SHA512 (sof-bin-2023.09.1.tar.gz) = 74a0de0cfc561a273f2f535239a5e23a3bdd7718c1f70e320cf11b58ff499ff437f98aab3171901165d3da4156b4374f5e4259bee152f7d10755b69e98b8ba51 +SHA512 (sof-bin-2023.09.2.tar.gz) = dbf9385c1900f0b0bda7b8b6a9d1a3b4e5556f0570a1b1b794104179a2e1a12f1e896e36062c4179d7ad1a55078cbbfb348eb10667d736ad99b6cd23c4af0832 From 8dfb6eb18e6edd8a5988a8f531de96ee8275ecff Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 20 Dec 2023 14:03:58 +0100 Subject: [PATCH 5/5] update to v2023.12 Signed-off-by: Jaroslav Kysela --- alsa-sof-firmware.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index 0ba9a27..859b4e7 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.2 +%global sof_ver 2023.12 #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 +* Wed Dec 20 2023 Jaroslav Kysela - 2023.12-1 +- Update to v2023.12 + * Thu Nov 16 2023 Jaroslav Kysela - 2023.09.2-1 - Update to v2023.09.2 diff --git a/sources b/sources index a8ad7a8..3ed4cb5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sof-bin-2023.09.2.tar.gz) = dbf9385c1900f0b0bda7b8b6a9d1a3b4e5556f0570a1b1b794104179a2e1a12f1e896e36062c4179d7ad1a55078cbbfb348eb10667d736ad99b6cd23c4af0832 +SHA512 (sof-bin-2023.12.tar.gz) = ed43e7597c93140b15499ba17bae1866dcf1e2959d910e81b3831e4db2224a1dcff790ef21afcd610d7cc9309251a08351bae1c959ded18e5e28a6b24ae99506