diff --git a/.gitignore b/.gitignore index 921bfba..c520a8f 100644 --- a/.gitignore +++ b/.gitignore @@ -22,15 +22,3 @@ /sof-bin-v2.2.6.tar.gz /sof-bin-2023.09.tar.gz /sof-bin-2023.09.1.tar.gz -/sof-bin-2023.09.2.tar.gz -/sof-bin-2023.12.1.tar.gz -/avs-topology_2024.02.tar.gz -/sof-bin-2024.03.tar.gz -/sof-bin-2024.06.tar.gz -/sof-bin-2024.09.tar.gz -/sof-bin-2024.09.1.tar.gz -/sof-bin-2024.09.2.tar.gz -/sof-bin-2025.01.tar.gz -/sof-bin-2025.01.1.tar.gz -/sof-bin-2025.05.tar.gz -/sof-bin-2025.05.1.tar.gz diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec index f31a42c..f2a3503 100644 --- a/alsa-sof-firmware.spec +++ b/alsa-sof-firmware.spec @@ -4,7 +4,7 @@ %global _firmwarepath /usr/lib/firmware %global _xz_opts -9 --check=crc32 -%global sof_ver 2025.05.1 +%global sof_ver 2023.09.1 #global sof_ver_pre rc1 %global sof_ver_rel %{?sof_ver_pre:.%{sof_ver_pre}} %global sof_ver_pkg0 %{sof_ver}%{?sof_ver_pre:-%{sof_ver_pre}} @@ -18,13 +18,13 @@ Summary: Firmware and topology files for Sound Open Firmware project Name: alsa-sof-firmware Version: %{sof_ver} -Release: 2%{?sof_ver_rel}%{?dist} +Release: 1%{?sof_ver_rel}%{?dist} # See later in the spec for a breakdown of licensing -License: BSD-3-Clause AND Apache-2.0 +License: BSD-3-Clause 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 %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 BuildRequires: alsa-topology >= %{tplg_version} BuildRequires: alsa-topology-utils >= %{tplg_version} @@ -39,7 +39,7 @@ This package contains the firmware binaries for the Sound Open Firmware project. %package debug Requires: alsa-sof-firmware Summary: Debug files for Sound Open Firmware project -License: BSD-3-Clause +License: BSD %description debug This package contains the debug files for the Sound Open Firmware project. @@ -49,14 +49,12 @@ This package contains the debug files for the Sound Open Firmware project. mkdir -p firmware/intel -for d in sof sof-ipc4 sof-ipc4-lib sof-ipc4-tplg sof-tplg; do \ +for d in sof sof-ipc4 sof-ace-tplg sof-tplg; do \ mv "${d}" firmware/intel; \ done -ln -s sof-ipc4-tplg firmware/intel/sof-ace-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 @@ -79,23 +77,9 @@ for d in sof sof-ipc4; do \ pushd "${n}"; \ ln -svf "${l}.xz" "${b}.xz"; \ popd; \ - done; \ + done done -for d in sof-ipc4-lib; do \ - for e in bin llext; do \ - find -P "firmware/intel/${d}" -type f -name "*.${e}" -exec xz -z %{_xz_opts} {} \; - for f in $(find -P "firmware/intel/${d}" -type l -name "*.${e}"); do \ - l=$(readlink "${f}"); \ - n=$(dirname "${f}"); \ - b=$(basename "${f}"); \ - rm "${f}"; \ - pushd "${n}"; \ - ln -svf "${l}.xz" "${b}.xz"; \ - popd; \ - done; \ - done; \ -done -for d in sof-tplg sof-ipc4-tplg; do \ +for d in sof-tplg sof-ace-tplg; do \ find -P "firmware/intel/${d}" -type f -name "*.tplg" -exec xz -z %{_xz_opts} {} \; done @@ -117,8 +101,6 @@ FILEDIR=$(pwd) pushd %{buildroot}/%{_firmwarepath} 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 "*.llext.xz" | sed -e '/^.$/d' >> $FILEDIR/alsa-sof-firmware.files -find -P intel/sof-ipc4-lib -name "*.bin.xz" | 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 popd @@ -139,8 +121,7 @@ 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 +%{_firmwarepath}/intel/sof-ace-tplg/*.tplg.xz # Licence: SOF (3-clause BSD plus others) # .. for files with suffix .ri @@ -154,94 +135,17 @@ 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 -* Fri Jan 16 2026 Fedora Release Engineering - 2025.05.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Wed Aug 27 2025 Jaroslav Kysela - 2025.05.1-1 -- Update to v2025.05.1 - -* Wed Jul 23 2025 Fedora Release Engineering - 2025.05-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Jun 24 2025 Jaroslav Kysela - 2025.05-1 -- Update to v2025.05 - -* Thu Apr 3 2025 Jaroslav Kysela - 2025.01.1-1 -- Update to v2025.01.1 - -* Tue Feb 25 2025 Jaroslav Kysela - 2025.01-1 -- Update to v2025.01 - -* Thu Jan 16 2025 Fedora Release Engineering - 2024.09.2-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Dec 18 2024 Jaroslav Kysela - 2024.09.2-2 -- Add sof-ipc4-lib directory - -* Fri Dec 6 2024 Jaroslav Kysela - 2024.09.2-1 -- Update to v2024.09.2 - -* Mon Nov 11 2024 Jaroslav Kysela - 2024.09.1-1 -- Update to v2024.09.1 - -* Fri Sep 27 2024 Jaroslav Kysela - 2024.09-1 -- Update to v2024.09 - -* Tue Sep 3 2024 Jaroslav Kysela - 2024.06-1 -- Update to v2024.06 -- Remove AVS topology files (linux-firmware is the main source now) - -* Wed Jul 17 2024 Fedora Release Engineering - 2024.03-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Wed Apr 3 2024 Jaroslav Kysela - 2024.03-2 -- Update to v2024.03 - -* Tue Mar 5 2024 Jaroslav Kysela - 2023.12.1-1 -- Update to v2023.12.1 -- Add AVS topology files v2024.02 - -* Mon Jan 22 2024 Fedora Release Engineering - 2023.12-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 2023.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Dec 20 2023 Jaroslav Kysela - 2023.12-1 -- Update to v2023.12 - -* Thu Nov 16 2023 Jaroslav Kysela - 2023.09.2-1 -- Update to v2023.09.2 - * Mon Nov 6 2023 Jaroslav Kysela - 2023.09.1-1 - Update to v2023.09.1 * Tue Oct 24 2023 Jaroslav Kysela - 2023.09-1 - Update to v2023.09 - -* Wed Aug 9 2023 Jaroslav Kysela - 2.2.6-1 -- Update to v2.2.6 - -* Wed Jul 19 2023 Fedora Release Engineering - 2.2.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jun 6 2023 Jaroslav Kysela - 2.2.5-2 - SPDX license * Mon May 15 2023 Jaroslav Kysela - 2.2.5-1 - Update to v2.2.5 -* Wed Jan 18 2023 Fedora Release Engineering - 2.2.4-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - * Mon Jan 9 2023 Jaroslav Kysela - 2.2.4-2 - Update to v2.2.4 diff --git a/sources b/sources index f2359d1..715c319 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (sof-bin-2025.05.1.tar.gz) = ad255502c607e80dcd9d42f4b734e10534e7b2bc36b0cc077b825a75b91040a9094df1fb3b3bab3a87b99940009b99835357f22bc6289c52fb66f472459fe8e1 +SHA512 (sof-bin-2023.09.tar.gz) = 7ef81549c76164629400622fa1b512b6061a37b9ba14383d69ac10b2e7dc35c4f35bd6444b15e725c749c23564ec84646960fedcd776b5c2ec11bda3933a633d +SHA512 (sof-bin-2023.09.1.tar.gz) = 74a0de0cfc561a273f2f535239a5e23a3bdd7718c1f70e320cf11b58ff499ff437f98aab3171901165d3da4156b4374f5e4259bee152f7d10755b69e98b8ba51