fix xz compression

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2022-02-04 09:13:22 +01:00
parent be26f115e3
commit 41a58d5fbc

View File

@ -2,6 +2,7 @@
# in the end package are expected. # in the end package are expected.
%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 _xz_opts -9 --check=crc32
%global sof_ver 2.0 %global sof_ver 2.0
#global sof_ver_pre rc1 #global sof_ver_pre rc1
@ -13,7 +14,7 @@
Summary: Firmware and topology files for Sound Open Firmware project Summary: Firmware and topology files for Sound Open Firmware project
Name: alsa-sof-firmware Name: alsa-sof-firmware
Version: %{sof_ver} Version: %{sof_ver}
Release: 2%{?sof_ver_rel}%{?dist} Release: 3%{?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
URL: https://github.com/thesofproject/sof-bin URL: https://github.com/thesofproject/sof-bin
@ -55,7 +56,7 @@ rm -rf firmware/intel/sof-tplg/sof-imx8*
rm -rf firmware/intel/sof-tplg/sof-mt8* rm -rf firmware/intel/sof-tplg/sof-mt8*
# use xz compression # use xz compression
find -P firmware/intel/sof -type f -name "*.ri" -exec xz -z9 {} \; find -P firmware/intel/sof -type f -name "*.ri" -exec xz -z %{_xz_opts} {} \;
for f in $(find -P firmware/intel/sof -type l -name "*.ri"); do \ for f in $(find -P firmware/intel/sof -type l -name "*.ri"); do \
l=$(readlink "${f}"); \ l=$(readlink "${f}"); \
d=$(dirname "${f}"); \ d=$(dirname "${f}"); \
@ -65,7 +66,7 @@ for f in $(find -P firmware/intel/sof -type l -name "*.ri"); do \
ln -svf "${l}.xz" "${b}.xz"; \ ln -svf "${l}.xz" "${b}.xz"; \
popd; \ popd; \
done done
find -P firmware/intel/sof-tplg -type f -name "*.tplg" -exec xz -z9 {} \; find -P firmware/intel/sof-tplg -type f -name "*.tplg" -exec xz -z %{_xz_opts} {} \;
%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
@ -73,7 +74,7 @@ find -P firmware/intel/sof-tplg -type f -name "*.tplg" -exec xz -z9 {} \;
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 # use xz compression
xz -z9 firmware/*.bin xz -z %{_xz_opts} firmware/*.bin
chmod 0644 firmware/*.bin.xz chmod 0644 firmware/*.bin.xz
%install %install
@ -118,6 +119,9 @@ if st and st.type == "link" then
end end
%changelog %changelog
* Fri Feb 4 2022 Jaroslav Kysela <perex@perex.cz> - 2.0-3
- Use CRC32 for the xz compression
* Thu Jan 27 2022 Jaroslav Kysela <perex@perex.cz> - 2.0-2 * Thu Jan 27 2022 Jaroslav Kysela <perex@perex.cz> - 2.0-2
- Update to v2.0 - Update to v2.0
- Use xz compression - Use xz compression