Compare commits

..

No commits in common. "imports/c9-beta/alsa-sof-firmware-2.1.1-1.el9" and "c8" have entirely different histories.

3 changed files with 54 additions and 69 deletions

View File

@ -1,2 +0,0 @@
2f648e3b14c2c0482b1388d910e69a362bf1c4c0 SOURCES/sof-bin-v2.1.1.tar.gz
a72be6d3ac7c68fef0aed6d1bb179c8dab81f4f9 SOURCES/sof-tplg-v2.1.1a.tar.gz

4
.gitignore vendored
View File

@ -1,2 +1,2 @@
SOURCES/sof-bin-v2.1.1.tar.gz SOURCES/skl_hda_dsp_generic-tplg.bin
SOURCES/sof-tplg-v2.1.1a.tar.gz SOURCES/sof-bin-2023.09.2.tar.gz

View File

@ -3,13 +3,14 @@
%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_ver 2.1.1 %global sof_ver 2023.09.2
#global sof_ver_pre rc2 #global sof_ver_pre rc1
%global sof_ver_rel %{?sof_ver_pre:.%{sof_ver_pre}} %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 1 %global with_sof_addon 0
%global sof_ver_addon 2.1.1a %global sof_ver_addon 0
%global tplg_version 1.2.4 %global tplg_version 1.2.4
@ -18,14 +19,13 @@ Name: alsa-sof-firmware
Version: %{sof_ver} Version: %{sof_ver}
Release: 1%{?sof_ver_rel}%{?dist} Release: 1%{?sof_ver_rel}%{?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-3-Clause
URL: https://github.com/thesofproject/sof-bin 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} %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 Source2: https://github.com/thesofproject/sof-bin/releases/download/v%{sof_ver_addon}/sof-tplg-v%{sof_ver_addon}.tar.gz
%endif %endif
BuildRequires: alsa-topology >= %{tplg_version} Source10: skl_hda_dsp_generic-tplg.bin
BuildRequires: alsa-topology-utils >= %{tplg_version}
# noarch, since the package is firmware # noarch, since the package is firmware
BuildArch: noarch BuildArch: noarch
@ -42,15 +42,13 @@ License: BSD
This package contains the debug files for the Sound Open Firmware project. This package contains the debug files for the Sound Open Firmware project.
%prep %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 for d in sof sof-ipc4 sof-ace-tplg sof-tplg; do \
mv sof-%{sof_ver_pkg}/* firmware/intel/sof mv "${d}" firmware/intel; \
done
# move topology files
mv sof-tplg-%{sof_ver_pkg} firmware/intel/sof-tplg
%if 0%{?with_sof_addon} %if 0%{?with_sof_addon}
tar xvzf %{SOURCE2} tar xvzf %{SOURCE2}
@ -58,17 +56,17 @@ mv sof-tplg-v%{sof_ver_addon}/*.tplg firmware/intel/sof-tplg
%endif %endif
# remove NXP firmware files # remove NXP firmware files
rm LICENCE.NXP rm Notice.NXP LICENCE.NXP
rm -rf firmware/intel/sof-tplg/sof-imx8* rm -rf firmware/intel/sof-tplg/sof-imx8*
# remove Mediatek firmware files # remove Mediatek firmware files
rm -rf firmware/intel/sof-tplg/sof-mt8* rm -rf firmware/intel/sof-tplg/sof-mt8*
%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 \ cp %{SOURCE10} firmware/skl_hda_dsp_generic-tplg.bin
-o firmware/skl_hda_dsp_generic-tplg.bin
%build
%install %install
mkdir -p %{buildroot}%{_firmwarepath} mkdir -p %{buildroot}%{_firmwarepath}
@ -90,6 +88,7 @@ cat alsa-sof-firmware.files
%files -f alsa-sof-firmware.files %files -f alsa-sof-firmware.files
%license LICENCE* %license LICENCE*
%doc README* %doc README*
%doc manifest.txt
%dir %{_firmwarepath} %dir %{_firmwarepath}
# Licence: 3-clause BSD # Licence: 3-clause BSD
@ -97,73 +96,61 @@ cat alsa-sof-firmware.files
# Licence: 3-clause BSD # Licence: 3-clause BSD
# .. for files with suffix .tplg # .. for files with suffix .tplg
%{_firmwarepath}/intel/sof-tplg %{_firmwarepath}/intel/sof-tplg/*.tplg
%{_firmwarepath}/intel/sof-ace-tplg/*.tplg
# Licence: SOF (3-clause BSD plus others) # Licence: SOF (3-clause BSD plus others)
# .. for files with suffix .ri # .. for files with suffix .ri
%files debug -f alsa-sof-firmware.debug-files %files debug -f alsa-sof-firmware.debug-files
%pretrans -p <lua>
path = "%{_firmwarepath}/intel/sof-tplg"
st = posix.stat(path)
if st and st.type == "link" then
os.remove(path)
end
%changelog %changelog
* Thu Nov 16 2023 Jaroslav Kysela <perex@perex.cz> - 2023.09.1-2
- Update to v2023.09.2
- SPDX license
* Mon May 15 2023 Jaroslav Kysela <perex@perex.cz> - 2.2.5-1
- Update to v2.2.5
* 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 * Mon Jun 20 2022 Jaroslav Kysela <perex@perex.cz> - 2.1.1-1
- Update to v2.1.1 + v2.1.1a (topology) - Update to v2.1.1 + v2.1.1a (topology)
* Mon Dec 20 2021 Jaroslav Kysela <perex@perex.cz> - 1.9.3-2 * 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 - Update to v1.9.3
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.8-2 * Tue Nov 23 2021 Jaroslav Kysela <perex@perex.cz> - 1.9.2-1
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Update to v1.9.2
Related: rhbz#1991688
* 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 * Thu Jul 22 2021 Jaroslav Kysela <perex@perex.cz> - 1.8-1
- Update to v1.8 - Update to v1.8
- Add SST Skylake HDA topology binary
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.1-5
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Thu Mar 11 2021 Jaroslav Kysela <perex@perex.cz> - 1.6.1-4
- Add SST Skylake HDA topology binary (bug#1933423)
* Fri Mar 5 2021 Jaroslav Kysela <perex@perex.cz> - 1.6.1-3
- Add TGL-H firmware files
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Sun Jan 3 2021 Jaroslav Kysela <perex@perex.cz> - 1.6.1-1 * Sun Jan 3 2021 Jaroslav Kysela <perex@perex.cz> - 1.6.1-1
- Update to v1.6.1 - Update to v1.6.1
* Thu Dec 10 2020 Jaroslav Kysela <perex@perex.cz> - 1.6-4 * Thu Dec 10 2020 Jaroslav Kysela <perex@perex.cz> - 1.6-2
- Update to v1.6 (Dec 9) - Update to v1.6 (Dec 9)
* Thu Nov 19 2020 Jaroslav Kysela <perex@perex.cz> - 1.6-3 * Wed Nov 11 2020 Jaroslav Kysela <perex@perex.cz> - 1.6-1
- Update to v1.6 (Nov 19)
* Wed Oct 14 2020 Jaroslav Kysela <perex@perex.cz> - 1.6-1
- Update to v1.6 (Oct 13) - Update to v1.6 (Oct 13)
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5-2 * Mon Jun 8 2020 Jaroslav Kysela <perex@perex.cz> - 1.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jun 1 2020 Jaroslav Kysela <perex@perex.cz> - 1.5-1
- Update to v1.5 - Update to v1.5
* Tue May 12 2020 Jaroslav Kysela <perex@perex.cz> - 1.4.2-6 * Tue Apr 21 2020 Jaroslav Kysela <perex@perex.cz> - 1.4.2-2
- Fix the upgrade (make /usr/lib/firmware/intel/sof-tplg directory again) - Initial version (Open Sound Firmware v1.4.2)
- Remove the version from all paths
* Thu Apr 30 2020 Jaroslav Kysela <perex@perex.cz> - 1.4.2-5
- Add missing symlink for sof-cfl.ri
* Thu Mar 12 2020 Jaroslav Kysela <perex@perex.cz> - 1.4.2-4
- Add missing symlink for sof-cml.ri
* Mon Mar 2 2020 Jaroslav Kysela <perex@perex.cz> - 1.4.2-3
- Initial version, SOF firmware 1.4.2