From 05ee365cad31a71bb125468422aa663147393159 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Thu, 27 Jan 2022 11:35:09 +0100 Subject: [PATCH] updated to v2.0 --- alsa-sof-firmware.spec | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index cb77ce7..6dc53df 100644 --- a/alsa-sof-firmware.spec +++ b/alsa-sof-firmware.spec @@ -3,7 +3,7 @@ %define _binaries_in_noarch_packages_terminate_build 0 %global _firmwarepath /usr/lib/firmware -%global sof_ver 1.9.3 +%global sof_ver 2.0 #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}} @@ -54,11 +54,27 @@ rm -rf firmware/intel/sof-tplg/sof-imx8* # remove Mediatek firmware files 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 # 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 firmware/skl_hda_dsp_generic-tplg.bin +# use xz compression +xz -z9 firmware/*.bin +chmod 0644 firmware/*.bin.xz %install mkdir -p %{buildroot}%{_firmwarepath} @@ -67,7 +83,7 @@ cp -ra firmware/* %{buildroot}%{_firmwarepath} # gather files and directories FILEDIR=$(pwd) 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 "*.ldc" | sed -e '/^.$/d' > $FILEDIR/alsa-sof-firmware.debug-files find -P . -type d | sed -e '/^.$/d' > $FILEDIR/alsa-sof-firmware.dirs @@ -83,11 +99,11 @@ cat alsa-sof-firmware.files %dir %{_firmwarepath} # Licence: 3-clause BSD -%{_firmwarepath}/*.bin +%{_firmwarepath}/*.bin.xz # Licence: 3-clause BSD # .. for files with suffix .tplg -%{_firmwarepath}/intel/sof-tplg +%{_firmwarepath}/intel/sof-tplg/*.tplg.xz # Licence: SOF (3-clause BSD plus others) # .. for files with suffix .ri @@ -102,6 +118,10 @@ if st and st.type == "link" then end %changelog +* Thu Jan 27 2022 Jaroslav Kysela - 2.0-1 +- Update to v2.0 +- Use xz compression + * Wed Jan 19 2022 Fedora Release Engineering - 1.9.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild