.alsa-sof-firmware.metadata

@@ -1 +1,2 @@
-722132a6ed893d7e3d22260cb3b86377e456e906 SOURCES/sof-bin-2024.03.tar.gz
+5b7d9cb372cb48d824b59b9bf61540a6af882c10 SOURCES/sof-bin-v2.2.5.tar.gz
+d953442c016b705d91fc5306424bc6468c50d21a SOURCES/sof-rpl-rt711-l0-rt1316-l12-rt714-l3.tplg.gz

.gitignore

@@ -1 +1,2 @@
-SOURCES/sof-bin-2024.03.tar.gz
+SOURCES/sof-bin-v2.2.5.tar.gz
+SOURCES/sof-rpl-rt711-l0-rt1316-l12-rt714-l3.tplg.gz

SPECS/alsa-sof-firmware.spec

@@ -1,14 +1,13 @@
-# This is a firmware package, so binaries (which are not run on the host) in
+# This is a firmware package, so binaries (which are not run on the host)
-# the end package are expected.
+# 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 2024.03
+%global sof_ver 2.2.5
-#global sof_ver_pre rc1
+#global sof_ver_pre rc2
 %global sof_ver_rel %{?sof_ver_pre:.%{sof_ver_pre}}
-%global sof_ver_pkg0 %{sof_ver}%{?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_pkg0}
 
 %global with_sof_addon 0
 %global sof_ver_addon 0
@@ -18,17 +17,17 @@
 Summary:        Firmware and topology files for Sound Open Firmware project
 Name:           alsa-sof-firmware
 Version:        %{sof_ver}
-Release:        10%{?sof_ver_rel}%{?dist}
+Release:        2%{?sof_ver_rel}%{?dist}
 # See later in the spec for a breakdown of licensing
-License:        BSD-3-Clause
+License:        BSD
 URL:            https://github.com/thesofproject/sof-bin
-Source:         https://github.com/thesofproject/sof-bin/releases/download/%{sof_ver_pkg}/sof-bin-%{sof_ver_pkg0}.tar.gz
+Source:         https://github.com/thesofproject/sof-bin/releases/download/%{sof_ver_pkg}/sof-bin-%{sof_ver_pkg}.tar.gz
 %if 0%{?with_sof_addon}
-Source3:        https://github.com/thesofproject/sof-bin/releases/download/v%{sof_ver_addon}/sof-tplg-v%{sof_ver_addon}.tar.gz
+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}
-Conflicts:      alsa-firmware <= 1.2.1-6
 
 # noarch, since the package is firmware
 BuildArch:      noarch
@@ -45,45 +44,44 @@ License:        BSD
 This package contains the debug files for the Sound Open Firmware project.
 
 %prep
-%autosetup -n sof-bin-%{sof_ver_pkg0}
+%autosetup -n sof-bin-%{sof_ver_pkg}
 
-mkdir -p firmware/intel
+mkdir -p firmware/intel/sof
 
-for d in sof sof-ipc4 sof-ipc4-tplg sof-tplg; do \
+# we have the version in the package name
-  mv "${d}" firmware/intel; \
+mv sof-%{sof_ver_pkg}/* firmware/intel/sof
-done
 
-ln -s sof-ipc4-tplg firmware/intel/sof-ace-tplg
+# move topology files
+mv sof-tplg-%{sof_ver_pkg} firmware/intel/sof-tplg
 
 %if 0%{?with_sof_addon}
-tar xvzf %{SOURCE3}
+tar xvzf %{SOURCE2}
 mv sof-tplg-v%{sof_ver_addon}/*.tplg firmware/intel/sof-tplg
 %endif
 
 # remove NXP firmware files
-rm Notice.NXP LICENCE.NXP
+rm LICENCE.NXP
 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
-xz -z %{_xz_opts} manifest.txt
+find -P firmware/intel/sof -type f -name "*.ri" -exec xz -z %{_xz_opts} {} \;
-for d in sof sof-ipc4; do \
+for f in $(find -P firmware/intel/sof -type l -name "*.ri"); do \
-  find -P "firmware/intel/${d}" -type f -name "*.ri" -exec xz -z %{_xz_opts} {} \;
-  for f in $(find -P "firmware/intel/${d}" -type l -name "*.ri"); do \
   l=$(readlink "${f}"); \
-    n=$(dirname "${f}"); \
+  d=$(dirname "${f}"); \
   b=$(basename "${f}"); \
   rm "${f}"; \
-    pushd "${n}"; \
+  pushd "${d}"; \
   ln -svf "${l}.xz" "${b}.xz"; \
   popd; \
 done
-done
+find -P firmware/intel/sof-tplg  -type f -name "*.tplg" -exec xz -z %{_xz_opts} {} \;
-for d in sof-tplg sof-ipc4-tplg; do \
-  find -P "firmware/intel/${d}"  -type f -name "*.tplg" -exec xz -z %{_xz_opts} {} \;
-done
 
 %build
 # SST topology files (not SOF related, but it's a Intel hw support
@@ -101,7 +99,7 @@ cp -ra firmware/* %{buildroot}%{_firmwarepath}
 # gather files and directories
 FILEDIR=$(pwd)
 pushd %{buildroot}/%{_firmwarepath}
-find -P . -name "*.ri.xz" | 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
@@ -114,7 +112,6 @@ cat alsa-sof-firmware.files
 %files -f alsa-sof-firmware.files
 %license LICENCE*
 %doc README*
-%doc manifest.txt.xz
 %dir %{_firmwarepath}
 
 # Licence: 3-clause BSD
@@ -123,8 +120,6 @@ cat alsa-sof-firmware.files
 # Licence: 3-clause BSD
 # .. for files with suffix .tplg
 %{_firmwarepath}/intel/sof-tplg/*.tplg.xz
-%{_firmwarepath}/intel/sof-ipc4-tplg/*.tplg.xz
-%{_firmwarepath}/intel/sof-ace-tplg
 
 # Licence: SOF (3-clause BSD plus others)
 # .. for files with suffix .ri
@@ -138,99 +133,36 @@ if st and st.type == "link" then
   os.remove(path)
 end
 
-path1 = "%{_firmwarepath}/intel/sof-ace-tplg"
-path2 = "%{_firmwarepath}/intel/sof-ipc4-tplg"
-st = posix.stat(path1)
-if st and st.type == "directory" then
-  os.rename(path1, path2)
-end
-
 %changelog
-* Tue Jul 30 2024 Jaroslav Kysela <perex@perex.cz> - 2024.03-9
+* Fri Jun 30 2023 Jaroslav Kysela <perex@perex.cz> - 2.2.5-2
-- Remove AVS topology files (moved to linux-firmware)
+- add sof-rpl-rt711-l0-rt1316-l12-rt714-l3.tplg for Dell SKU 0BDA
-
+- add xz compression support (with CRC32)
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2024.03-8
-- Bump release for June 2024 mass rebuild
-
-* Mon Jun 17 2024 Jaroslav Kysela <perex@perex.cz> - 2024.03-7
-- Update to v2024.03
-- Add AVS topology files v2024.02
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2023.12-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2023.12-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Dec 20 2023 Jaroslav Kysela <perex@perex.cz> - 2023.12-1
-- Update to v2023.12
-
-* Thu Nov 16 2023 Jaroslav Kysela <perex@perex.cz> - 2023.09.2-1
-- Update to v2023.09.2
-
-* Mon Nov  6 2023 Jaroslav Kysela <perex@perex.cz> - 2023.09.1-1
-- Update to v2023.09.1
-
-* Tue Oct 24 2023 Jaroslav Kysela <perex@perex.cz> - 2023.09-1
-- Update to v2023.09
-
-* Wed Aug  9 2023 Jaroslav Kysela <perex@perex.cz> - 2.2.6-1
-- Update to v2.2.6
-
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.5-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Jun  6 2023 Jaroslav Kysela <perex@perex.cz> - 2.2.5-2
-- SPDX license
-
-* Mon May 15 2023 Jaroslav Kysela <perex@perex.cz> - 2.2.5-1
 - Update to v2.2.5
 
-* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.4-3
+* Mon Jan  9 2023 Jaroslav Kysela <perex@perex.cz> - 2.2.4-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Mon Jan  9 2023 Jaroslav Kysela <perex@perex.cz> - 2.2.4-2
 - Update to v2.2.4
 
 * Wed Dec  7 2022 Jaroslav Kysela <perex@perex.cz> - 2.2.3-1
 - Update to v2.2.3
 
-* Sat Sep 24 2022 Jaroslav Kysela <perex@perex.cz> - 2.2.2-1
+* Thu Sep 29 2022 Jaroslav Kysela <perex@perex.cz> - 2.2.2-1
 - Update to v2.2.2
 
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-2
+* Mon Jun 20 2022 Jaroslav Kysela <perex@perex.cz> - 2.1.1-1
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jun 17 2022 Jaroslav Kysela <perex@perex.cz> - 2.1.1-1
 - Update to v2.1.1 + v2.1.1a (topology)
 
-* Fri Feb  4 2022 Jaroslav Kysela <perex@perex.cz> - 2.0-3
+* Mon Dec 20 2021 Jaroslav Kysela <perex@perex.cz> - 1.9.3-2
-- Use CRC32 for the xz compression
-
-* Thu Jan 27 2022 Jaroslav Kysela <perex@perex.cz> - 2.0-2
-- Update to v2.0
-- Use xz compression
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Wed Dec 15 2021 Jaroslav Kysela <perex@perex.cz> - 1.9.3-1
 - Update to v1.9.3
 
-* Tue Nov 23 2021 Jaroslav Kysela <perex@perex.cz> - 1.9.2-1
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.8-2
-- Update to v1.9.2
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-
+  Related: rhbz#1991688
-* Tue Oct  5 2021 Jaroslav Kysela <perex@perex.cz> - 1.9-2
-- Update to v1.9
-
-* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
-* Tue Jun 22 2021 Jaroslav Kysela <perex@perex.cz> - 1.8-1
+* Thu Jul 22 2021 Jaroslav Kysela <perex@perex.cz> - 1.8-1
 - Update to v1.8
 
-* Thu Jun  3 2021 Jaroslav Kysela <perex@perex.cz> - 1.7-1
+* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 1.6.1-5
-- Update to v1.7
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
 * Thu Mar 11 2021 Jaroslav Kysela <perex@perex.cz> - 1.6.1-4
 - Add SST Skylake HDA topology binary (bug#1933423)