Compare commits

...

No commits in common. "imports/c8s/alsa-sof-firmware-1.6.1-2.el8" and "c8" have entirely different histories.

3 changed files with 68 additions and 45 deletions

View File

@ -1 +1,2 @@
353b7a21a8880dc33c39c9880ca2bab35be7c8ca SOURCES/sof-bin-f31c9ce.tar.gz
3aef419f1d2ddf360b7757214c21cbef7aabadc8 SOURCES/skl_hda_dsp_generic-tplg.bin
2a5336a8c5ced0e8bb9ba5237a52e7ac37833b13 SOURCES/sof-bin-v2.2.4.tar.gz

3
.gitignore vendored
View File

@ -1 +1,2 @@
SOURCES/sof-bin-f31c9ce.tar.gz
SOURCES/skl_hda_dsp_generic-tplg.bin
SOURCES/sof-bin-v2.2.4.tar.gz

View File

@ -3,19 +3,28 @@
%define _binaries_in_noarch_packages_terminate_build 0
%global _firmwarepath /usr/lib/firmware
%global sof_ver 2.2.4
#global sof_ver_pre rc2
%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_version 1.6.1
%global sof_commit f31c9ce30ac2792ec39e19da489aee7631e00654
%global sof_shortcommit %(c=%{sof_commit}; echo ${c:0:7})
%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_version}
Release: 2%{?dist}
Version: %{sof_ver}
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
Source: https://github.com/thesofproject/sof-bin/archive/%{sof_commit}/sof-bin-%{sof_shortcommit}.tar.gz
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
Source10: skl_hda_dsp_generic-tplg.bin
# noarch, since the package is firmware
BuildArch: noarch
@ -32,53 +41,37 @@ License: BSD
This package contains the debug files for the Sound Open Firmware project.
%prep
%autosetup -n sof-bin-%{sof_commit}
%autosetup -n sof-bin-%{sof_ver_pkg}
cd lib/firmware
mkdir -p firmware/intel/sof
# we have the version in the package name
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 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
mv sof-%{sof_ver_pkg}/* firmware/intel/sof
# move topology files
rm -f intel/sof-tplg
mv intel/sof-tplg-v%{sof_version} intel/sof-tplg
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 -rf nxp ../../LICENCE.NXP
rm -rf intel/sof-tplg/sof-imx8*
rm LICENCE.NXP
rm -rf firmware/intel/sof-tplg/sof-imx8*
# remove Mediatek firmware files
rm -rf firmware/intel/sof-tplg/sof-mt8*
# SST topology files (not SOF related, but it's a Intel hw support
# and this package seems a good place to distribute them
cp %{SOURCE10} firmware/skl_hda_dsp_generic-tplg.bin
%build
%install
mkdir -p %{buildroot}%{_firmwarepath}
cp -ra lib/firmware/* %{buildroot}%{_firmwarepath}
cp -ra firmware/* %{buildroot}%{_firmwarepath}
# gather files and directories
FILEDIR=$(pwd)
@ -98,6 +91,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
@ -108,8 +104,33 @@ cat alsa-sof-firmware.files
%files debug -f alsa-sof-firmware.debug-files
%changelog
* Fri Mar 5 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-2
- Add TGL-H firmware files
* Mon Jan 9 2023 Jaroslav Kysela <perex@perex.cz> - 2.2.4-2
- Update to v2.2.4
* Wed Dec 7 2022 Jaroslav Kysela <perex@perex.cz> - 2.2.3-1
- Update to v2.2.3
* Thu Sep 29 2022 Jaroslav Kysela <perex@perex.cz> - 2.2.2-1
- Update to v2.2.2
* Mon Jun 20 2022 Jaroslav Kysela <perex@perex.cz> - 2.1.1-1
- Update to v2.1.1 + v2.1.1a (topology)
* Wed May 11 2022 Jaroslav Kysela <perex@perex.cz> - 1.9.3-3
- Add sof-adl-rt711-l2-rt1316-l01.tplg topology file
* Thu Dec 16 2021 Jaroslav Kysela <perex@perex.cz> - 1.9.3-1
- Update to v1.9.3
* Tue Nov 23 2021 Jaroslav Kysela <perex@perex.cz> - 1.9.2-1
- Update to v1.9.2
* Tue Oct 26 2021 Jaroslav Kysela <perex@perex.cz> - 1.9-1
- Update to v1.9
* Thu Jul 22 2021 Jaroslav Kysela <perex@perex.cz> - 1.8-1
- Update to v1.8
- Add SST Skylake HDA topology binary
* Sun Jan 3 2021 Jaroslav Kysela <perex@perex.cz> - 1.6.1-1
- Update to v1.6.1