From ff6c7237b785a31ff20d2b9b6ef3813a639bc899 Mon Sep 17 00:00:00 2001
From: rockyautomation <rockyautomation@rockylinux.org>
Date: Wed, 29 Nov 2023 16:29:26 +0000
Subject: [PATCH] import alsa-sof-firmware-2023.09.2-1.el8
---
.alsa-sof-firmware.checksum | 1 +
.alsa-sof-firmware.metadata | 4 ++--
SPECS/alsa-sof-firmware.spec | 35 ++++++++++++++++++++---------------
3 files changed, 23 insertions(+), 17 deletions(-)
create mode 100644 .alsa-sof-firmware.checksum
diff --git a/.alsa-sof-firmware.checksum b/.alsa-sof-firmware.checksum
new file mode 100644
index 0000000..54495ba
--- /dev/null
+++ b/.alsa-sof-firmware.checksum
@@ -0,0 +1 @@
+Direct Git Import
diff --git a/.alsa-sof-firmware.metadata b/.alsa-sof-firmware.metadata
index d64b0ed..077fdfd 100644
--- a/.alsa-sof-firmware.metadata
+++ b/.alsa-sof-firmware.metadata
@@ -1,2 +1,2 @@
-253096a771e77563fab2108e979ed7fd4570c53d57372b7adf5b9da7cd8d3c39efe078a52d2595759cea826a1ac473c2711b6d7ca721784b87abee459dadf122 SOURCES/skl_hda_dsp_generic-tplg.bin
-c8a5f846c6ca39b39c1160aaf8c607f301b4e153dadb337b0d3a99c5993a933948a2c2bd80950e6459da4d707c9a5100c11b868d11695bbb7ca56bf86f7fa9db SOURCES/sof-bin-v2.2.5.tar.gz
+9db7ccea4edb16bebff53ea4c99d953ec862db951fb6f2ec90c3e81ee6083bab SOURCES/skl_hda_dsp_generic-tplg.bin
+23063a3e447497bbb2683d0c5f3a0fbb248dabfb24544138be0e73e9e15e0f63 SOURCES/sof-bin-2023.09.2.tar.gz
diff --git a/SPECS/alsa-sof-firmware.spec b/SPECS/alsa-sof-firmware.spec
index f3f9ff9..c48e160 100644
--- a/SPECS/alsa-sof-firmware.spec
+++ b/SPECS/alsa-sof-firmware.spec
@@ -3,10 +3,11 @@
%define _binaries_in_noarch_packages_terminate_build 0
%global _firmwarepath /usr/lib/firmware
-%global sof_ver 2.2.5
-#global sof_ver_pre rc2
+%global sof_ver 2023.09.2
+#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}}
+%global sof_ver_pkg0 %{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
@@ -16,11 +17,11 @@
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
+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_pkg}.tar.gz
+Source: https://github.com/thesofproject/sof-bin/releases/download/%{sof_ver_pkg}/sof-bin-%{sof_ver_pkg0}.tar.gz
%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
@@ -41,15 +42,13 @@ License: BSD
This package contains the debug files for the Sound Open Firmware project.
%prep
-%autosetup -n sof-bin-%{sof_ver_pkg}
-
-mkdir -p firmware/intel/sof
+%autosetup -n sof-bin-%{sof_ver_pkg0}
-# we have the version in the package name
-mv sof-%{sof_ver_pkg}/* firmware/intel/sof
+mkdir -p firmware/intel
-# move topology files
-mv sof-tplg-%{sof_ver_pkg} firmware/intel/sof-tplg
+for d in sof sof-ipc4 sof-ace-tplg sof-tplg; do \
+ mv "${d}" firmware/intel; \
+done
%if 0%{?with_sof_addon}
tar xvzf %{SOURCE2}
@@ -57,7 +56,7 @@ mv sof-tplg-v%{sof_ver_addon}/*.tplg firmware/intel/sof-tplg
%endif
# remove NXP firmware files
-rm LICENCE.NXP
+rm Notice.NXP LICENCE.NXP
rm -rf firmware/intel/sof-tplg/sof-imx8*
# remove Mediatek firmware files
@@ -89,6 +88,7 @@ cat alsa-sof-firmware.files
%files -f alsa-sof-firmware.files
%license LICENCE*
%doc README*
+%doc manifest.txt
%dir %{_firmwarepath}
# Licence: 3-clause BSD
@@ -96,7 +96,8 @@ cat alsa-sof-firmware.files
# Licence: 3-clause BSD
# .. for files with suffix .tplg
-%{_firmwarepath}/intel/sof-tplg
+%{_firmwarepath}/intel/sof-tplg/*.tplg
+%{_firmwarepath}/intel/sof-ace-tplg/*.tplg
# Licence: SOF (3-clause BSD plus others)
# .. for files with suffix .ri
@@ -104,6 +105,10 @@ cat alsa-sof-firmware.files
%files debug -f alsa-sof-firmware.debug-files
%changelog
+* Thu Nov 16 2023 Jaroslav Kysela <perex@perex.cz> - 2023.09.1-2
+- Update to v2023.09.2
+- SPDX license
+
* Mon May 15 2023 Jaroslav Kysela <perex@perex.cz> - 2.2.5-1
- Update to v2.2.5
--
GitLab