update to v1.7

This commit is contained in:
Jaroslav Kysela 2021-06-03 16:10:59 +02:00
parent 1e34dde749
commit 97e35fa0b0

View File

@ -3,8 +3,8 @@
%define _binaries_in_noarch_packages_terminate_build 0 %define _binaries_in_noarch_packages_terminate_build 0
%global _firmwarepath /usr/lib/firmware %global _firmwarepath /usr/lib/firmware
%global sof_version 1.6.1 %global sof_version 1.7
%global sof_commit f31c9ce30ac2792ec39e19da489aee7631e00654 %global sof_commit 6bd5501e6ac3f29dde42a28ffe03a2942aa60640
%global sof_shortcommit %(c=%{sof_commit}; echo ${c:0:7}) %global sof_shortcommit %(c=%{sof_commit}; echo ${c:0:7})
%global tplg_version 1.2.4 %global tplg_version 1.2.4
@ -12,7 +12,7 @@
Summary: Firmware and topology files for Sound Open Firmware project Summary: Firmware and topology files for Sound Open Firmware project
Name: alsa-sof-firmware Name: alsa-sof-firmware
Version: %{sof_version} Version: %{sof_version}
Release: 4%{?dist} Release: 1%{?dist}
# See later in the spec for a breakdown of licensing # See later in the spec for a breakdown of licensing
License: BSD License: BSD
URL: https://github.com/thesofproject/sof-bin URL: https://github.com/thesofproject/sof-bin
@ -38,55 +38,27 @@ This package contains the debug files for the Sound Open Firmware project.
%prep %prep
%autosetup -n sof-bin-%{sof_commit} %autosetup -n sof-bin-%{sof_commit}
cd lib/firmware mkdir -p firmware/intel/sof
# we have the version in the package name # we have the version in the package name
mv intel/sof/v%{sof_version}/* intel/sof mv sof-v%{sof_version}/* firmware/intel/sof
rmdir intel/sof/v%{sof_version}
# rename intel signed firmware files
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 jsl tgl tgl-h; do
mv intel/sof/public-signed/sof-$platform-v%{sof_version}.ri intel/sof/public-signed/sof-$platform.ri
done
# rename unsigned firmware files
for platform in bdw byt cht; do
mv intel/sof/sof-$platform-v%{sof_version}.ri intel/sof/sof-$platform.ri
done
# rename debug files
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
# add missing symlinks
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
# move topology files # move topology files
rm -f intel/sof-tplg mv sof-tplg-v%{sof_version} firmware/intel/sof-tplg
mv intel/sof-tplg-v%{sof_version} intel/sof-tplg
# remove NXP firmware files # remove NXP firmware files
rm -rf nxp ../../LICENCE.NXP rm LICENCE.NXP
rm -rf intel/sof-tplg/sof-imx8* rm -rf firmware/intel/sof-tplg/sof-imx8*
%build %build
# SST topology files (not SOF related, but it's a Intel hw support # SST topology files (not SOF related, but it's a Intel hw support
# and this package seems a good place to distribute them # and this package seems a good place to distribute them
alsatplg -c /usr/share/alsa/topology/hda-dsp/skl_hda_dsp_generic-tplg.conf \ alsatplg -c /usr/share/alsa/topology/hda-dsp/skl_hda_dsp_generic-tplg.conf \
-o lib/firmware/skl_hda_dsp_generic-tplg.bin -o firmware/skl_hda_dsp_generic-tplg.bin
%install %install
mkdir -p %{buildroot}%{_firmwarepath} mkdir -p %{buildroot}%{_firmwarepath}
cp -ra lib/firmware/* %{buildroot}%{_firmwarepath} cp -ra firmware/* %{buildroot}%{_firmwarepath}
# gather files and directories # gather files and directories
FILEDIR=$(pwd) FILEDIR=$(pwd)
@ -126,6 +98,9 @@ if st and st.type == "link" then
end end
%changelog %changelog
* Thu Jun 3 2021 Jaroslav Kysela <perex@perex.cz> - 1.7-1
- Update to v1.7
* Thu Mar 11 2021 Jaroslav Kysela <perex@perex.cz> - 1.6.1-4 * Thu Mar 11 2021 Jaroslav Kysela <perex@perex.cz> - 1.6.1-4
- Add SST Skylake HDA topology binary (bug#1933423) - Add SST Skylake HDA topology binary (bug#1933423)