From 93b6ec77a8b79289f96871004b4aa8ba3845c528 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Wed, 14 Oct 2020 16:19:31 +0200 Subject: [PATCH 1/7] Update to v1.6 (Oct 13 2020) --- .gitignore | 1 + alsa-sof-firmware.spec | 20 ++++++++++---------- sources | 3 +-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 0c7be40..c5cc832 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /sof-bin-72a04d5.tar.gz /sof-bin-topology-1.5-dmic-20db-fix.tar.gz /sof-bin-e6d11bf.tar.gz +/sof-bin-47b436a.tar.gz diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index ef94d8b..5026cf7 100644 --- a/alsa-sof-firmware.spec +++ b/alsa-sof-firmware.spec @@ -4,19 +4,18 @@ %global _firmwarepath /usr/lib/firmware -%global sof_version 1.5 -%global sof_commit e6d11bf44f0c7ad6032d201e753aa254bb075ee7 +%global sof_version 1.6 +%global sof_commit 47b436af36c18c3b4f409e1d9452aea18e17abc8 %global sof_shortcommit %(c=%{sof_commit}; echo ${c:0:7}) Summary: Firmware and topology files for Sound Open Firmware project Name: alsa-sof-firmware Version: %{sof_version} -Release: 2%{?dist} +Release: 1%{?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/archive/%{sof_commit}/sof-bin-%{sof_shortcommit}.tar.gz -Source10: https://www.alsa-project.org/files/pub/misc/sof/sof-bin-topology-1.5-dmic-20db-fix.tar.gz Conflicts: alsa-firmware <= 1.2.1-6 # noarch, since the package is firmware @@ -43,13 +42,13 @@ mv intel/sof/v%{sof_version}/* intel/sof rmdir intel/sof/v%{sof_version} # rename intel signed firmware files -for platform in apl cnl icl; do +for platform in apl cnl icl tgl; do mv intel/sof/intel-signed/sof-$platform-v%{sof_version}.ri intel/sof/intel-signed/sof-$platform.ri ln -sf intel-signed/sof-$platform.ri intel/sof/sof-$platform.ri done # rename public signed firmware files -for platform in apl cnl icl; do +for platform in apl cnl icl tgl; do mv intel/sof/public-signed/sof-$platform-v%{sof_version}.ri intel/sof/public-signed/sof-$platform.ri done @@ -72,10 +71,8 @@ rm -f intel/sof-tplg mv intel/sof-tplg-v%{sof_version} intel/sof-tplg # remove NXP firmware files -rm -rf nxp - -# patch the topology files (DMIC equalizer fix) -tar xvzf %{SOURCE10} -C intel/sof-tplg +rm -rf nxp ../../LICENCE.NXP +rm -rf intel/sof-tplg/sof-imx8* %build @@ -118,6 +115,9 @@ if st and st.type == "link" then end %changelog +* Wed Oct 14 2020 Jaroslav Kysela - 1.6-1 +- Update to v1.6 (Oct 13) + * Mon Jul 27 2020 Fedora Release Engineering - 1.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index 3f4f401..63b02cf 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (sof-bin-topology-1.5-dmic-20db-fix.tar.gz) = d933433a1327cc32f2b4c783aee7fca8d5d89f04ebb764b9e6ebb46c84b0035b54083aab50118879da16eedaf8301063be87c680eec09f4b2c4d2915735b7247 -SHA512 (sof-bin-e6d11bf.tar.gz) = 6f5ece43a6f15be4dd38b52bf2d65402a667a8c431688f815e5eabd22ff7efa273052823dba64d68096202e468c7a623bb2338d7cbcbae855cdac78af41824c2 +SHA512 (sof-bin-47b436a.tar.gz) = 447726c70344f029c246f83d8071da953e7a90b2f810ecd46a42802956173e4faabf86f65a18fbfbea570190f081cb026b688209218b9ac9b51fee94fbacc0ca From e634fbf5e118d7bbd171bd69ad43b54e0cd661f0 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 11 Dec 2020 16:17:56 +0100 Subject: [PATCH 2/7] update to v1.6 (Dec 9 2020) --- .gitignore | 2 ++ alsa-sof-firmware.spec | 17 +++++++++++------ sources | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index c5cc832..311c6e2 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /sof-bin-topology-1.5-dmic-20db-fix.tar.gz /sof-bin-e6d11bf.tar.gz /sof-bin-47b436a.tar.gz +/sof-bin-da8cb04.tar.gz +/sof-bin-faa5bdc.tar.gz diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index 5026cf7..64fb2d4 100644 --- a/alsa-sof-firmware.spec +++ b/alsa-sof-firmware.spec @@ -5,13 +5,13 @@ %global sof_version 1.6 -%global sof_commit 47b436af36c18c3b4f409e1d9452aea18e17abc8 +%global sof_commit faa5bdc276651f3f8b7c77612fff770bd778987b %global sof_shortcommit %(c=%{sof_commit}; echo ${c:0:7}) Summary: Firmware and topology files for Sound Open Firmware project Name: alsa-sof-firmware Version: %{sof_version} -Release: 1%{?dist} +Release: 2%{?dist} # See later in the spec for a breakdown of licensing License: BSD URL: https://github.com/thesofproject/sof-bin @@ -42,13 +42,13 @@ mv intel/sof/v%{sof_version}/* intel/sof rmdir intel/sof/v%{sof_version} # rename intel signed firmware files -for platform in apl cnl icl tgl; do +for platform in apl cnl ehl icl tgl; do mv intel/sof/intel-signed/sof-$platform-v%{sof_version}.ri intel/sof/intel-signed/sof-$platform.ri ln -sf intel-signed/sof-$platform.ri intel/sof/sof-$platform.ri done # rename public signed firmware files -for platform in apl cnl icl tgl; do +for platform in apl cnl icl jsl tgl; do mv intel/sof/public-signed/sof-$platform-v%{sof_version}.ri intel/sof/public-signed/sof-$platform.ri done @@ -58,11 +58,13 @@ for platform in bdw byt cht; do done # rename debug files -for platform in apl bdw byt cht cnl icl; do +for platform in apl bdw byt cht cnl ehl icl jsl tgl; do mv intel/sof/sof-$platform-v%{sof_version}.ldc intel/sof/sof-$platform.ldc done -# add missing symlink +# add missing symlinks +ln -s public-signed/sof-jsl.ri intel/sof/sof-jsl.ri +ln -s intel-signed/sof-apl.ri intel/sof/sof-glk.ri ln -s intel-signed/sof-cnl.ri intel/sof/sof-cml.ri ln -s intel-signed/sof-cnl.ri intel/sof/sof-cfl.ri @@ -115,6 +117,9 @@ if st and st.type == "link" then end %changelog +* Thu Dec 10 2020 Jaroslav Kysela - 1.6-2 +- Update to v1.6 (Dec 9) + * Wed Oct 14 2020 Jaroslav Kysela - 1.6-1 - Update to v1.6 (Oct 13) diff --git a/sources b/sources index 63b02cf..89eea20 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sof-bin-47b436a.tar.gz) = 447726c70344f029c246f83d8071da953e7a90b2f810ecd46a42802956173e4faabf86f65a18fbfbea570190f081cb026b688209218b9ac9b51fee94fbacc0ca +SHA512 (sof-bin-faa5bdc.tar.gz) = 0e1bd526b3fd1c85d10b6612da25f044a62eeb2025dc4ac19ed2c7a2cffecdab50ce65ec714cf8ce2bb2eb2efe128495f9a13a48264593c15649f76b4b026359 From 48a114f93b90d76f7f85e08e00464406adfb372b Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Sun, 3 Jan 2021 17:53:11 +0100 Subject: [PATCH 3/7] update to 1.6.1 --- .gitignore | 1 + alsa-sof-firmware.spec | 14 ++++++++------ sources | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 311c6e2..6e71e1a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /sof-bin-47b436a.tar.gz /sof-bin-da8cb04.tar.gz /sof-bin-faa5bdc.tar.gz +/sof-bin-b77c851.tar.gz diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index 64fb2d4..32cb022 100644 --- a/alsa-sof-firmware.spec +++ b/alsa-sof-firmware.spec @@ -4,14 +4,14 @@ %global _firmwarepath /usr/lib/firmware -%global sof_version 1.6 -%global sof_commit faa5bdc276651f3f8b7c77612fff770bd778987b +%global sof_version 1.6.1 +%global sof_commit b77c851bc4ec1b6b552eaf1a61a66f3df4a13ab8 %global sof_shortcommit %(c=%{sof_commit}; echo ${c:0:7}) Summary: Firmware and topology files for Sound Open Firmware project Name: alsa-sof-firmware Version: %{sof_version} -Release: 2%{?dist} +Release: 1%{?dist} # See later in the spec for a breakdown of licensing License: BSD URL: https://github.com/thesofproject/sof-bin @@ -48,7 +48,7 @@ for platform in apl cnl ehl icl tgl; do done # rename public signed firmware files -for platform in apl cnl icl jsl tgl; do +for platform in apl cnl icl tgl; do mv intel/sof/public-signed/sof-$platform-v%{sof_version}.ri intel/sof/public-signed/sof-$platform.ri done @@ -58,12 +58,11 @@ for platform in bdw byt cht; do done # rename debug files -for platform in apl bdw byt cht cnl ehl icl jsl tgl; do +for platform in apl bdw byt cht cnl ehl icl tgl; do mv intel/sof/sof-$platform-v%{sof_version}.ldc intel/sof/sof-$platform.ldc done # add missing symlinks -ln -s public-signed/sof-jsl.ri intel/sof/sof-jsl.ri ln -s intel-signed/sof-apl.ri intel/sof/sof-glk.ri ln -s intel-signed/sof-cnl.ri intel/sof/sof-cml.ri ln -s intel-signed/sof-cnl.ri intel/sof/sof-cfl.ri @@ -117,6 +116,9 @@ if st and st.type == "link" then end %changelog +* Sun Jan 3 2021 Jaroslav Kysela - 1.6.1-1 +- Update to v1.6.1 + * Thu Dec 10 2020 Jaroslav Kysela - 1.6-2 - Update to v1.6 (Dec 9) diff --git a/sources b/sources index 89eea20..2875adc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sof-bin-faa5bdc.tar.gz) = 0e1bd526b3fd1c85d10b6612da25f044a62eeb2025dc4ac19ed2c7a2cffecdab50ce65ec714cf8ce2bb2eb2efe128495f9a13a48264593c15649f76b4b026359 +SHA512 (sof-bin-b77c851.tar.gz) = 85ef3cdeff44f55cb4d393268616763238c345aac0755360807c8c238f8fe88360ed609b39f9d736c85a9e8a70dac54f82b6d6d5669a6d7269914480d46091a1 From 2a44d9fcd922b3c106794996b988f5ee9295605b Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 5 Mar 2021 14:10:29 +0100 Subject: [PATCH 4/7] add TGL-H firmware files --- .gitignore | 1 + alsa-sof-firmware.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 6e71e1a..c39e352 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /sof-bin-da8cb04.tar.gz /sof-bin-faa5bdc.tar.gz /sof-bin-b77c851.tar.gz +/sof-bin-f31c9ce.tar.gz diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index 32cb022..356adf0 100644 --- a/alsa-sof-firmware.spec +++ b/alsa-sof-firmware.spec @@ -5,13 +5,13 @@ %global sof_version 1.6.1 -%global sof_commit b77c851bc4ec1b6b552eaf1a61a66f3df4a13ab8 +%global sof_commit f31c9ce30ac2792ec39e19da489aee7631e00654 %global sof_shortcommit %(c=%{sof_commit}; echo ${c:0:7}) Summary: Firmware and topology files for Sound Open Firmware project Name: alsa-sof-firmware Version: %{sof_version} -Release: 1%{?dist} +Release: 2%{?dist} # See later in the spec for a breakdown of licensing License: BSD URL: https://github.com/thesofproject/sof-bin @@ -42,13 +42,13 @@ mv intel/sof/v%{sof_version}/* intel/sof rmdir intel/sof/v%{sof_version} # rename intel signed firmware files -for platform in apl cnl ehl icl tgl; do +for platform in apl cnl ehl icl tgl tgl-h; do mv intel/sof/intel-signed/sof-$platform-v%{sof_version}.ri intel/sof/intel-signed/sof-$platform.ri ln -sf intel-signed/sof-$platform.ri intel/sof/sof-$platform.ri done # rename public signed firmware files -for platform in apl cnl icl tgl; do +for platform in apl cnl icl jsl tgl tgl-h; do mv intel/sof/public-signed/sof-$platform-v%{sof_version}.ri intel/sof/public-signed/sof-$platform.ri done @@ -58,7 +58,7 @@ for platform in bdw byt cht; do done # rename debug files -for platform in apl bdw byt cht cnl ehl icl tgl; do +for platform in apl bdw byt cht cnl ehl icl tgl tgl-h; do mv intel/sof/sof-$platform-v%{sof_version}.ldc intel/sof/sof-$platform.ldc done @@ -116,6 +116,9 @@ if st and st.type == "link" then end %changelog +* Fri Mar 5 2021 Fedora Release Engineering - 1.6.1-2 +- Add TGL-H firmware files + * Sun Jan 3 2021 Jaroslav Kysela - 1.6.1-1 - Update to v1.6.1 diff --git a/sources b/sources index 2875adc..69e33a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sof-bin-b77c851.tar.gz) = 85ef3cdeff44f55cb4d393268616763238c345aac0755360807c8c238f8fe88360ed609b39f9d736c85a9e8a70dac54f82b6d6d5669a6d7269914480d46091a1 +SHA512 (sof-bin-f31c9ce.tar.gz) = 9eedb85c520c0489e7a2f4c5d09e489d022dd88239e2f18aa792fd538ec11200d750c2501e78868f30d29624ce58522bbd2cc86302dffa9a6cd94f1d640d9840 From c59462e363ea0cae292c1bb0f50a3283b0c8103d Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 11 Mar 2021 19:59:50 +0100 Subject: [PATCH 5/7] Add SST Skylake HDA topology binary (bug#1933423) --- alsa-sof-firmware.spec | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index 356adf0..4bf2937 100644 --- a/alsa-sof-firmware.spec +++ b/alsa-sof-firmware.spec @@ -8,14 +8,18 @@ %global sof_commit f31c9ce30ac2792ec39e19da489aee7631e00654 %global sof_shortcommit %(c=%{sof_commit}; echo ${c:0:7}) +%global tplg_version 1.2.4 + Summary: Firmware and topology files for Sound Open Firmware project Name: alsa-sof-firmware Version: %{sof_version} -Release: 2%{?dist} +Release: 3%{?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/archive/%{sof_commit}/sof-bin-%{sof_shortcommit}.tar.gz +BuildRequires: alsa-topology >= %{tplg_version} +BuildRequires: alsa-topology-utils >= %{tplg_version} Conflicts: alsa-firmware <= 1.2.1-6 # noarch, since the package is firmware @@ -76,6 +80,10 @@ rm -rf nxp ../../LICENCE.NXP rm -rf intel/sof-tplg/sof-imx8* %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 lib/firmware/skl_hda_dsp_generic-tplg.bin %install mkdir -p %{buildroot}%{_firmwarepath} @@ -99,6 +107,9 @@ cat alsa-sof-firmware.files %doc README* %dir %{_firmwarepath} +# Licence: 3-clause BSD +%{_firmwarepath}/*.bin + # Licence: 3-clause BSD # .. for files with suffix .tplg %{_firmwarepath}/intel/sof-tplg @@ -116,7 +127,10 @@ if st and st.type == "link" then end %changelog -* Fri Mar 5 2021 Fedora Release Engineering - 1.6.1-2 +* Fri Mar 11 2021 Jaroslav Kysela - 1.6.1-3 +- Add SST Skylake HDA topology binary (bug#1933423) + +* Fri Mar 5 2021 Jaroslav Kysela - 1.6.1-2 - Add TGL-H firmware files * Sun Jan 3 2021 Jaroslav Kysela - 1.6.1-1 From 1965b6748f6216a7dd2a13c33adb62d1c5ca2433 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 11 Mar 2021 20:48:46 +0100 Subject: [PATCH 6/7] rpmlint fixes --- alsa-sof-firmware.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index 4bf2937..2253afd 100644 --- a/alsa-sof-firmware.spec +++ b/alsa-sof-firmware.spec @@ -19,7 +19,7 @@ License: BSD URL: https://github.com/thesofproject/sof-bin Source: https://github.com/thesofproject/sof-bin/archive/%{sof_commit}/sof-bin-%{sof_shortcommit}.tar.gz BuildRequires: alsa-topology >= %{tplg_version} -BuildRequires: alsa-topology-utils >= %{tplg_version} +BuildRequires: alsa-topology-utils >= %{tplg_version} Conflicts: alsa-firmware <= 1.2.1-6 # noarch, since the package is firmware @@ -83,7 +83,7 @@ rm -rf intel/sof-tplg/sof-imx8* # 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 lib/firmware/skl_hda_dsp_generic-tplg.bin + -o lib/firmware/skl_hda_dsp_generic-tplg.bin %install mkdir -p %{buildroot}%{_firmwarepath} @@ -127,7 +127,7 @@ if st and st.type == "link" then end %changelog -* Fri Mar 11 2021 Jaroslav Kysela - 1.6.1-3 +* Thu Mar 11 2021 Jaroslav Kysela - 1.6.1-3 - Add SST Skylake HDA topology binary (bug#1933423) * Fri Mar 5 2021 Jaroslav Kysela - 1.6.1-2 From e6a8ff83c3cae57094920b59cba3bad7105b3f54 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 12 Mar 2021 20:16:25 +0100 Subject: [PATCH 7/7] bumb release --- 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 2253afd..622cef9 100644 --- a/alsa-sof-firmware.spec +++ b/alsa-sof-firmware.spec @@ -13,7 +13,7 @@ Summary: Firmware and topology files for Sound Open Firmware project Name: alsa-sof-firmware Version: %{sof_version} -Release: 3%{?dist} +Release: 4%{?dist} # See later in the spec for a breakdown of licensing License: BSD URL: https://github.com/thesofproject/sof-bin @@ -127,7 +127,7 @@ if st and st.type == "link" then end %changelog -* Thu Mar 11 2021 Jaroslav Kysela - 1.6.1-3 +* Fri Mar 12 2021 Jaroslav Kysela - 1.6.1-4 - Add SST Skylake HDA topology binary (bug#1933423) * Fri Mar 5 2021 Jaroslav Kysela - 1.6.1-2