From caa2b9c36663b313c90836b0c0049eb9ff86c7c0 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 28 Mar 2024 14:57:08 +0000 Subject: [PATCH] import CS alsa-sof-firmware-2023.09.2-1.el8 --- .alsa-sof-firmware.metadata | 2 +- .gitignore | 2 +- SPECS/alsa-sof-firmware.spec | 35 ++++++++++++++++++++--------------- 3 files changed, 22 insertions(+), 17 deletions(-) diff --git a/.alsa-sof-firmware.metadata b/.alsa-sof-firmware.metadata index ccf0138..d4c5eb7 100644 --- a/.alsa-sof-firmware.metadata +++ b/.alsa-sof-firmware.metadata @@ -1,2 +1,2 @@ 3aef419f1d2ddf360b7757214c21cbef7aabadc8 SOURCES/skl_hda_dsp_generic-tplg.bin -5b7d9cb372cb48d824b59b9bf61540a6af882c10 SOURCES/sof-bin-v2.2.5.tar.gz +35f5b937d02f0296a8e9449afcbb3f31d6f65ef8 SOURCES/sof-bin-2023.09.2.tar.gz diff --git a/.gitignore b/.gitignore index 949e441..90b8c95 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/skl_hda_dsp_generic-tplg.bin -SOURCES/sof-bin-v2.2.5.tar.gz +SOURCES/sof-bin-2023.09.2.tar.gz diff --git a/SPECS/alsa-sof-firmware.spec b/SPECS/alsa-sof-firmware.spec index f3f9ff9..c48e160 100644 --- a/SPECS/alsa-sof-firmware.spec +++ b/SPECS/alsa-sof-firmware.spec @@ -3,10 +3,11 @@ %define _binaries_in_noarch_packages_terminate_build 0 %global _firmwarepath /usr/lib/firmware -%global sof_ver 2.2.5 -#global sof_ver_pre rc2 +%global sof_ver 2023.09.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}} +%global sof_ver_pkg0 %{sof_ver}%{?sof_ver_pre:-%{sof_ver_pre}} +%global sof_ver_pkg v%{sof_ver_pkg0} %global with_sof_addon 0 %global sof_ver_addon 0 @@ -16,11 +17,11 @@ 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 +License: BSD-3-Clause 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} Source2: https://github.com/thesofproject/sof-bin/releases/download/v%{sof_ver_addon}/sof-tplg-v%{sof_ver_addon}.tar.gz %endif @@ -41,15 +42,13 @@ License: BSD This package contains the debug files for the Sound Open Firmware project. %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 -mv sof-%{sof_ver_pkg}/* firmware/intel/sof - -# move topology files -mv sof-tplg-%{sof_ver_pkg} firmware/intel/sof-tplg +for d in sof sof-ipc4 sof-ace-tplg sof-tplg; do \ + mv "${d}" firmware/intel; \ +done %if 0%{?with_sof_addon} tar xvzf %{SOURCE2} @@ -57,7 +56,7 @@ mv sof-tplg-v%{sof_ver_addon}/*.tplg firmware/intel/sof-tplg %endif # remove NXP firmware files -rm LICENCE.NXP +rm Notice.NXP LICENCE.NXP rm -rf firmware/intel/sof-tplg/sof-imx8* # remove Mediatek firmware files @@ -89,6 +88,7 @@ cat alsa-sof-firmware.files %files -f alsa-sof-firmware.files %license LICENCE* %doc README* +%doc manifest.txt %dir %{_firmwarepath} # Licence: 3-clause BSD @@ -96,7 +96,8 @@ cat alsa-sof-firmware.files # Licence: 3-clause BSD # .. 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) # .. for files with suffix .ri @@ -104,6 +105,10 @@ cat alsa-sof-firmware.files %files debug -f alsa-sof-firmware.debug-files %changelog +* Thu Nov 16 2023 Jaroslav Kysela - 2023.09.1-2 +- Update to v2023.09.2 +- SPDX license + * Mon May 15 2023 Jaroslav Kysela - 2.2.5-1 - Update to v2.2.5