From 3788f01ca24f41ab1b7d95c2824a0eda9693bba6 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 5 Oct 2021 13:49:41 +0200 Subject: [PATCH 1/6] updated to v1.9 --- .gitignore | 1 + alsa-sof-firmware.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 0ef4d2c..e8d1cbe 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /sof-bin-f31c9ce.tar.gz /sof-bin-6bd5501.tar.gz /sof-bin-v1.8.tar.gz +/sof-bin-v1.9.tar.gz diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index cef929d..b4ec589 100644 --- a/alsa-sof-firmware.spec +++ b/alsa-sof-firmware.spec @@ -3,8 +3,8 @@ %define _binaries_in_noarch_packages_terminate_build 0 %global _firmwarepath /usr/lib/firmware -%global sof_ver 1.8 -#global sof_ver_pre rc2 +%global sof_ver 1.9 +#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}} @@ -13,7 +13,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 @@ -99,6 +99,9 @@ if st and st.type == "link" then end %changelog +* Tue Oct 5 2021 Jaroslav Kysela - 1.9-1 +- Update to v1.9 + * Wed Jul 21 2021 Fedora Release Engineering - 1.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index f1352f3..c57e54a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sof-bin-v1.8.tar.gz) = b103828769de5a267889466608adac20aad4790be8da9680498d3b8f8d0c407b9813d13d5ed12db7238a409064a7fe345b73927c566239c27b98e1c7bea3cd99 +SHA512 (sof-bin-v1.9.tar.gz) = aee733381edb2150f2132c296e9151b1d6a71246e204b15c2394587c528286f730ceaf02002e1e58ccea0deba5e4ae81cb7a03efb858ac954633b0cfaec81a22 From 59bfd42bee812fad1716063c3fc84580327b4ba8 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Tue, 23 Nov 2021 17:57:28 +0100 Subject: [PATCH 2/6] updated to v1.9.2 --- .gitignore | 1 + alsa-sof-firmware.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e8d1cbe..10734fa 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /sof-bin-6bd5501.tar.gz /sof-bin-v1.8.tar.gz /sof-bin-v1.9.tar.gz +/sof-bin-v1.9.2.tar.gz diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index b4ec589..7b2aaa4 100644 --- a/alsa-sof-firmware.spec +++ b/alsa-sof-firmware.spec @@ -3,7 +3,7 @@ %define _binaries_in_noarch_packages_terminate_build 0 %global _firmwarepath /usr/lib/firmware -%global sof_ver 1.9 +%global sof_ver 1.9.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}} @@ -99,6 +99,9 @@ if st and st.type == "link" then end %changelog +* Tue Nov 23 2021 Jaroslav Kysela - 1.9.2-1 +- Update to v1.9.2 + * Tue Oct 5 2021 Jaroslav Kysela - 1.9-1 - Update to v1.9 diff --git a/sources b/sources index c57e54a..a78ed0f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sof-bin-v1.9.tar.gz) = aee733381edb2150f2132c296e9151b1d6a71246e204b15c2394587c528286f730ceaf02002e1e58ccea0deba5e4ae81cb7a03efb858ac954633b0cfaec81a22 +SHA512 (sof-bin-v1.9.2.tar.gz) = 2b4c30a73fa8dece91c54f030b346f31c0500d36de047bd7820ed8eebe7a6cdb56bc374fc0485e5e083d4a3e1dfad7d0c2c39c166b438bf6bd40d68af65aee7e From ff79b9a3ed399f9a2a7b6199ccb6626a882e6f03 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 15 Dec 2021 09:54:57 +0100 Subject: [PATCH 3/6] updated to v1.9.3 --- .gitignore | 1 + alsa-sof-firmware.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 10734fa..2740a24 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /sof-bin-v1.8.tar.gz /sof-bin-v1.9.tar.gz /sof-bin-v1.9.2.tar.gz +/sof-bin-v1.9.3.tar.gz diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index 7b2aaa4..47ac2e4 100644 --- a/alsa-sof-firmware.spec +++ b/alsa-sof-firmware.spec @@ -3,7 +3,7 @@ %define _binaries_in_noarch_packages_terminate_build 0 %global _firmwarepath /usr/lib/firmware -%global sof_ver 1.9.2 +%global sof_ver 1.9.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}} @@ -51,6 +51,9 @@ mv sof-tplg-%{sof_ver_pkg} firmware/intel/sof-tplg rm LICENCE.NXP rm -rf firmware/intel/sof-tplg/sof-imx8* +# remove Mediatek firmware files +rm -rf firmware/intel/sof-tplg/sof-mt8* + %build # SST topology files (not SOF related, but it's a Intel hw support # and this package seems a good place to distribute them @@ -99,6 +102,9 @@ if st and st.type == "link" then end %changelog +* Wed Dec 15 2021 Jaroslav Kysela - 1.9.3-1 +- Update to v1.9.3 + * Tue Nov 23 2021 Jaroslav Kysela - 1.9.2-1 - Update to v1.9.2 diff --git a/sources b/sources index a78ed0f..04db3c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sof-bin-v1.9.2.tar.gz) = 2b4c30a73fa8dece91c54f030b346f31c0500d36de047bd7820ed8eebe7a6cdb56bc374fc0485e5e083d4a3e1dfad7d0c2c39c166b438bf6bd40d68af65aee7e +SHA512 (sof-bin-v1.9.3.tar.gz) = 0c04bf47ecf65d3352b730e79968cb020211c274f64a3cc21e4c5e49c5a9706ab4d541aaea931e72c1bcc67fcde6387bc6bf952a33691aaab06e6b93aa73a024 From f5b5267312279b55d094fa3d2bd364cd9e42e707 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 27 Jan 2022 21:47:22 +0100 Subject: [PATCH 4/6] updated to v2.0 --- .gitignore | 1 + alsa-sof-firmware.spec | 28 ++++++++++++++++++++++++---- sources | 2 +- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2740a24..ad203bd 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /sof-bin-v1.9.tar.gz /sof-bin-v1.9.2.tar.gz /sof-bin-v1.9.3.tar.gz +/sof-bin-v2.0.tar.gz diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index 47ac2e4..67f0dfc 100644 --- a/alsa-sof-firmware.spec +++ b/alsa-sof-firmware.spec @@ -3,7 +3,7 @@ %define _binaries_in_noarch_packages_terminate_build 0 %global _firmwarepath /usr/lib/firmware -%global sof_ver 1.9.3 +%global sof_ver 2.0 #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}} @@ -54,11 +54,27 @@ 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 -z9 {} \; +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 -z9 {} \; + %build # SST topology files (not SOF related, but it's a Intel hw support # and this package seems a good place to distribute them alsatplg -c /usr/share/alsa/topology/hda-dsp/skl_hda_dsp_generic-tplg.conf \ -o firmware/skl_hda_dsp_generic-tplg.bin +# use xz compression +xz -z9 firmware/*.bin +chmod 0644 firmware/*.bin.xz %install mkdir -p %{buildroot}%{_firmwarepath} @@ -67,7 +83,7 @@ cp -ra firmware/* %{buildroot}%{_firmwarepath} # gather files and directories FILEDIR=$(pwd) pushd %{buildroot}/%{_firmwarepath} -find -P . -name "*.ri" | sed -e '/^.$/d' > $FILEDIR/alsa-sof-firmware.files +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 "*.ldc" | sed -e '/^.$/d' > $FILEDIR/alsa-sof-firmware.debug-files find -P . -type d | sed -e '/^.$/d' > $FILEDIR/alsa-sof-firmware.dirs @@ -83,11 +99,11 @@ cat alsa-sof-firmware.files %dir %{_firmwarepath} # Licence: 3-clause BSD -%{_firmwarepath}/*.bin +%{_firmwarepath}/*.bin.xz # Licence: 3-clause BSD # .. for files with suffix .tplg -%{_firmwarepath}/intel/sof-tplg +%{_firmwarepath}/intel/sof-tplg/*.tplg.xz # Licence: SOF (3-clause BSD plus others) # .. for files with suffix .ri @@ -102,6 +118,10 @@ if st and st.type == "link" then end %changelog +* Thu Jan 27 2022 Jaroslav Kysela - 2.0-1 +- Update to v2.0 +- Use xz compression + * Wed Dec 15 2021 Jaroslav Kysela - 1.9.3-1 - Update to v1.9.3 diff --git a/sources b/sources index 04db3c9..c38d7fc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sof-bin-v1.9.3.tar.gz) = 0c04bf47ecf65d3352b730e79968cb020211c274f64a3cc21e4c5e49c5a9706ab4d541aaea931e72c1bcc67fcde6387bc6bf952a33691aaab06e6b93aa73a024 +SHA512 (sof-bin-v2.0.tar.gz) = 44b0c662598e95dfb5dd2dda86d08e3f136c6f99b1ffd4f55b65ea2be35480736c4d751b5108c15b00369a3bb8955e7d9ad410cc93beeb09e8620baf3ce2070c From f6673b044d5208d5c26d62157013da0fc381489c Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 4 Feb 2022 09:13:22 +0100 Subject: [PATCH 5/6] fix xz compression Signed-off-by: Jaroslav Kysela --- alsa-sof-firmware.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index 67f0dfc..362c459 100644 --- a/alsa-sof-firmware.spec +++ b/alsa-sof-firmware.spec @@ -2,6 +2,7 @@ # in the end package are expected. %define _binaries_in_noarch_packages_terminate_build 0 %global _firmwarepath /usr/lib/firmware +%global _xz_opts -9 --check=crc32 %global sof_ver 2.0 #global sof_ver_pre rc1 @@ -13,7 +14,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 @@ -55,7 +56,7 @@ rm -rf firmware/intel/sof-tplg/sof-imx8* rm -rf firmware/intel/sof-tplg/sof-mt8* # use xz compression -find -P firmware/intel/sof -type f -name "*.ri" -exec xz -z9 {} \; +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}"); \ @@ -65,7 +66,7 @@ for f in $(find -P firmware/intel/sof -type l -name "*.ri"); do \ ln -svf "${l}.xz" "${b}.xz"; \ popd; \ done -find -P firmware/intel/sof-tplg -type f -name "*.tplg" -exec xz -z9 {} \; +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 @@ -73,7 +74,7 @@ find -P firmware/intel/sof-tplg -type f -name "*.tplg" -exec xz -z9 {} \; alsatplg -c /usr/share/alsa/topology/hda-dsp/skl_hda_dsp_generic-tplg.conf \ -o firmware/skl_hda_dsp_generic-tplg.bin # use xz compression -xz -z9 firmware/*.bin +xz -z %{_xz_opts} firmware/*.bin chmod 0644 firmware/*.bin.xz %install @@ -118,6 +119,9 @@ if st and st.type == "link" then end %changelog +* Fri Feb 4 2022 Jaroslav Kysela - 2.0-2 +- Use CRC32 for the xz compression + * Thu Jan 27 2022 Jaroslav Kysela - 2.0-1 - Update to v2.0 - Use xz compression From cdd970d51414181e4f1149272b84e9da14aa81ae Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 17 Jun 2022 17:00:43 +0200 Subject: [PATCH 6/6] update to v2.1.1 + v2.1.1a (topology) Signed-off-by: Jaroslav Kysela --- .gitignore | 3 +++ alsa-sof-firmware.spec | 18 ++++++++++++++++-- sources | 3 ++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ad203bd..334e4a2 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ /sof-bin-v1.9.2.tar.gz /sof-bin-v1.9.3.tar.gz /sof-bin-v2.0.tar.gz +/sof-tplg-v2.1.1a.tar.gz +/alsa-sof-firmware-2.1.1-1.fc37.src.rpm +/sof-bin-v2.1.1.tar.gz diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index 362c459..fcca289 100644 --- a/alsa-sof-firmware.spec +++ b/alsa-sof-firmware.spec @@ -4,21 +4,27 @@ %global _firmwarepath /usr/lib/firmware %global _xz_opts -9 --check=crc32 -%global sof_ver 2.0 +%global sof_ver 2.1.1 #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 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 Source: https://github.com/thesofproject/sof-bin/releases/download/%{sof_ver_pkg}/sof-bin-%{sof_ver_pkg}.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 BuildRequires: alsa-topology >= %{tplg_version} BuildRequires: alsa-topology-utils >= %{tplg_version} Conflicts: alsa-firmware <= 1.2.1-6 @@ -48,6 +54,11 @@ mv sof-%{sof_ver_pkg}/* firmware/intel/sof # move topology files mv sof-tplg-%{sof_ver_pkg} firmware/intel/sof-tplg +%if 0%{?with_sof_addon} +tar xvzf %{SOURCE2} +mv sof-tplg-v%{sof_ver_addon}/*.tplg firmware/intel/sof-tplg +%endif + # remove NXP firmware files rm LICENCE.NXP rm -rf firmware/intel/sof-tplg/sof-imx8* @@ -119,6 +130,9 @@ if st and st.type == "link" then end %changelog +* Fri Jun 17 2022 Jaroslav Kysela - 2.1.1-1 +- Update to v2.1.1 + v2.1.1a (topology) + * Fri Feb 4 2022 Jaroslav Kysela - 2.0-2 - Use CRC32 for the xz compression diff --git a/sources b/sources index c38d7fc..c765245 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (sof-bin-v2.0.tar.gz) = 44b0c662598e95dfb5dd2dda86d08e3f136c6f99b1ffd4f55b65ea2be35480736c4d751b5108c15b00369a3bb8955e7d9ad410cc93beeb09e8620baf3ce2070c +SHA512 (sof-bin-v2.1.1.tar.gz) = 77e9562f67014d78b213fe428edef6a08dcc058a9a762da09a486c002c3aa0b907ea7c8ba6d4f88f5ddab5e564de06df9f2ed77206341a0fe2e1aaab1d9740ce +SHA512 (sof-tplg-v2.1.1a.tar.gz) = 48f8aa8023313d44ddce6c5a2c9f9e9acdd3320b52e2718eaf949d030e79e8ea547e101374f59fd7492e763983af030a5ecfa3725c48e72cddfdefecb9421ece