updated to v2.0

This commit is contained in:
Jaroslav Kysela 2022-01-27 11:35:09 +01:00
parent 3761df3c02
commit 05ee365cad

View File

@ -3,7 +3,7 @@
%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 1.9.3 %global sof_ver 2.0
#global sof_ver_pre rc1 #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_pkg v%{sof_ver}%{?sof_ver_pre:-%{sof_ver_pre}}
@ -54,11 +54,27 @@ 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*
# use xz compression
find -P firmware/intel/sof -type f -name "*.ri" -exec xz -z9 {} \;
for f in $(find -P firmware/intel/sof -type l -name "*.ri"); do \
l=$(readlink "${f}"); \
d=$(dirname "${f}"); \
b=$(basename "${f}"); \
rm "${f}"; \
pushd "${d}"; \
ln -svf "${l}.xz" "${b}.xz"; \
popd; \
done
find -P firmware/intel/sof-tplg -type f -name "*.tplg" -exec xz -z9 {} \;
%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 firmware/skl_hda_dsp_generic-tplg.bin -o firmware/skl_hda_dsp_generic-tplg.bin
# use xz compression
xz -z9 firmware/*.bin
chmod 0644 firmware/*.bin.xz
%install %install
mkdir -p %{buildroot}%{_firmwarepath} mkdir -p %{buildroot}%{_firmwarepath}
@ -67,7 +83,7 @@ cp -ra firmware/* %{buildroot}%{_firmwarepath}
# gather files and directories # gather files and directories
FILEDIR=$(pwd) FILEDIR=$(pwd)
pushd %{buildroot}/%{_firmwarepath} pushd %{buildroot}/%{_firmwarepath}
find -P . -name "*.ri" | sed -e '/^.$/d' > $FILEDIR/alsa-sof-firmware.files find -P . -name "*.ri.xz" | sed -e '/^.$/d' >> $FILEDIR/alsa-sof-firmware.files
#find -P . -name "*.tplg" | sed -e '/^.$/d' >> $FILEDIR/alsa-sof-firmware.files #find -P . -name "*.tplg" | sed -e '/^.$/d' >> $FILEDIR/alsa-sof-firmware.files
find -P . -name "*.ldc" | sed -e '/^.$/d' > $FILEDIR/alsa-sof-firmware.debug-files find -P . -name "*.ldc" | sed -e '/^.$/d' > $FILEDIR/alsa-sof-firmware.debug-files
find -P . -type d | sed -e '/^.$/d' > $FILEDIR/alsa-sof-firmware.dirs find -P . -type d | sed -e '/^.$/d' > $FILEDIR/alsa-sof-firmware.dirs
@ -83,11 +99,11 @@ cat alsa-sof-firmware.files
%dir %{_firmwarepath} %dir %{_firmwarepath}
# Licence: 3-clause BSD # Licence: 3-clause BSD
%{_firmwarepath}/*.bin %{_firmwarepath}/*.bin.xz
# 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.xz
# Licence: SOF (3-clause BSD plus others) # Licence: SOF (3-clause BSD plus others)
# .. for files with suffix .ri # .. for files with suffix .ri
@ -102,6 +118,10 @@ if st and st.type == "link" then
end end
%changelog %changelog
* Thu Jan 27 2022 Jaroslav Kysela <perex@perex.cz> - 2.0-1
- Update to v2.0
- Use xz compression
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.3-2 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild