Update to 1.8

Resolves: rhbz#1977258
This commit is contained in:
Jaroslav Kysela 2021-07-01 09:55:08 +02:00
parent 9441586646
commit 35665cb87c
3 changed files with 20 additions and 45 deletions

2
.gitignore vendored
View File

@ -5,4 +5,4 @@
/sof-bin-da8cb04.tar.gz
/sof-bin-faa5bdc.tar.gz
/sof-bin-b77c851.tar.gz
/sof-bin-f31c9ce.tar.gz
/sof-bin-v1.8.tar.gz

View File

@ -3,23 +3,23 @@
%define _binaries_in_noarch_packages_terminate_build 0
%global _firmwarepath /usr/lib/firmware
%global sof_version 1.6.1
%global sof_commit f31c9ce30ac2792ec39e19da489aee7631e00654
%global sof_shortcommit %(c=%{sof_commit}; echo ${c:0:7})
%global sof_ver 1.8
#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 tplg_version 1.2.4
Summary: Firmware and topology files for Sound Open Firmware project
Name: alsa-sof-firmware
Version: %{sof_version}
Release: 5%{?dist}
Version: %{sof_ver}
Release: 1%{?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
BuildRequires: alsa-topology >= %{tplg_version}
BuildRequires: alsa-topology-utils >= %{tplg_version}
Conflicts: alsa-firmware <= 1.2.1-6
# noarch, since the package is firmware
BuildArch: noarch
@ -36,57 +36,29 @@ 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
# 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*
%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
-o firmware/skl_hda_dsp_generic-tplg.bin
%install
mkdir -p %{buildroot}%{_firmwarepath}
cp -ra lib/firmware/* %{buildroot}%{_firmwarepath}
cp -ra firmware/* %{buildroot}%{_firmwarepath}
# gather files and directories
FILEDIR=$(pwd)
@ -126,6 +98,9 @@ if st and st.type == "link" then
end
%changelog
* Thu Jul 22 2021 Jaroslav Kysela <perex@perex.cz> - 1.8-1
- Update to v1.8
* 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

View File

@ -1 +1 @@
SHA512 (sof-bin-f31c9ce.tar.gz) = 9eedb85c520c0489e7a2f4c5d09e489d022dd88239e2f18aa792fd538ec11200d750c2501e78868f30d29624ce58522bbd2cc86302dffa9a6cd94f1d640d9840
SHA512 (sof-bin-v1.8.tar.gz) = b103828769de5a267889466608adac20aad4790be8da9680498d3b8f8d0c407b9813d13d5ed12db7238a409064a7fe345b73927c566239c27b98e1c7bea3cd99