diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index c34ecb5..5e1aa25 100644 --- a/alsa-sof-firmware.spec +++ b/alsa-sof-firmware.spec @@ -2,6 +2,7 @@ # in the end package are expected. %define _binaries_in_noarch_packages_terminate_build 0 %global _firmwarepath /usr/lib/firmware +%global _xz_opts -9 --check=crc32 %global sof_ver 2.2.5 #global sof_ver_pre rc2 @@ -16,7 +17,7 @@ Summary: Firmware and topology files for Sound Open Firmware project Name: alsa-sof-firmware Version: %{sof_ver} -Release: 1%{?sof_ver_rel}%{?dist} +Release: 2%{?sof_ver_rel}%{?dist} # See later in the spec for a breakdown of licensing License: BSD URL: https://github.com/thesofproject/sof-bin @@ -24,6 +25,7 @@ Source: https://github.com/thesofproject/sof-bin/releases/download/%{sof %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 +Source10: sof-rpl-rt711-l0-rt1316-l12-rt714-l3.tplg.gz BuildRequires: alsa-topology >= %{tplg_version} BuildRequires: alsa-topology-utils >= %{tplg_version} @@ -64,11 +66,31 @@ rm -rf firmware/intel/sof-tplg/sof-imx8* # remove Mediatek firmware files rm -rf firmware/intel/sof-tplg/sof-mt8* +# Extra topology for Dell SKU 0BDA +zcat %{SOURCE10} > firmware/intel/sof-tplg/$(basename %{SOURCE10} .gz) +chmod 0644 firmware/intel/sof-tplg/$(basename %{SOURCE10} .gz) + +# use xz compression +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 \ + 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 -z %{_xz_opts} {} \; + %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 -z %{_xz_opts} firmware/*.bin +chmod 0644 firmware/*.bin.xz %install mkdir -p %{buildroot}%{_firmwarepath} @@ -77,7 +99,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 @@ -93,11 +115,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 @@ -112,6 +134,10 @@ if st and st.type == "link" then end %changelog +* Thu Jun 15 2023 Jaroslav Kysela - 2.2.5-2 +- add sof-rpl-rt711-l0-rt1316-l12-rt714-l3.tplg for Dell SKU 0BDA +- add xz compression support (with CRC32) + * Mon May 15 2023 Jaroslav Kysela - 2.2.5-1 - Update to v2.2.5 diff --git a/sof-rpl-rt711-l0-rt1316-l12-rt714-l3.tplg.gz b/sof-rpl-rt711-l0-rt1316-l12-rt714-l3.tplg.gz new file mode 100644 index 0000000..1da32c1 Binary files /dev/null and b/sof-rpl-rt711-l0-rt1316-l12-rt714-l3.tplg.gz differ