From f62c4c7bbfaadd53179c36380353e7022aeffc43 Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <jkysela@redhat.com>
Date: Tue, 30 Jul 2024 09:31:55 +0200
Subject: [PATCH] Remove AVS files (moved to linux-firmware)

Resolves: RHEL-49606

Signed-off-by: Jaroslav Kysela <jkysela@redhat.com>
---
 alsa-sof-firmware.spec | 19 ++-----------------
 sources                |  1 -
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/alsa-sof-firmware.spec b/alsa-sof-firmware.spec
index 9adab09..79ad0c6 100644
--- a/alsa-sof-firmware.spec
+++ b/alsa-sof-firmware.spec
@@ -5,7 +5,6 @@
 %global _xz_opts -9 --check=crc32
 
 %global sof_ver 2024.03
-%global sof_ver_avs 2024.02
 #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}}
@@ -19,12 +18,11 @@
 Summary:        Firmware and topology files for Sound Open Firmware project
 Name:           alsa-sof-firmware
 Version:        %{sof_ver}
-Release:        5%{?sof_ver_rel}%{?dist}
+Release:        6%{?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
-Source2:        https://github.com/thesofproject/avs-topology-xml/releases/download/v%{sof_ver_avs}/avs-topology_%{sof_ver_avs}.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
 %endif
@@ -55,12 +53,6 @@ for d in sof sof-ipc4 sof-ipc4-tplg sof-tplg; do \
   mv "${d}" firmware/intel; \
 done
 
-mkdir avs
-tar xvzf %{SOURCE2} --strip-components=1 --directory=avs
-mv avs/LICENSE LICENCE.avs
-mv avs/lib/firmware/intel/avs firmware/intel
-echo "%{sof_ver_avs}" > manifest.avs.txt
-
 %if 0%{?with_sof_addon}
 tar xvzf %{SOURCE3}
 mv sof-tplg-v%{sof_ver_addon}/*.tplg firmware/intel/sof-tplg
@@ -90,9 +82,6 @@ done
 for d in sof-tplg sof-ipc4-tplg; do \
   find -P "firmware/intel/${d}"  -type f -name "*.tplg" -exec xz -z %{_xz_opts} {} \;
 done
-for d in avs; do \
-  find -P "firmware/intel/${d}"  -type f -name "*.bin" -exec xz -z %{_xz_opts} {} \;
-done
 
 mv firmware/intel/sof-ipc4-tplg firmware/intel/sof-ace-tplg
 ln -s sof-ace-tplg firmware/intel/sof-ipc4-tplg
@@ -127,7 +116,6 @@ cat alsa-sof-firmware.files
 %license LICENCE*
 %doc README*
 %doc manifest.txt.xz
-%doc manifest.avs.txt
 %dir %{_firmwarepath}
 
 # Licence: 3-clause BSD
@@ -139,9 +127,6 @@ cat alsa-sof-firmware.files
 %{_firmwarepath}/intel/sof-ace-tplg/*.tplg.xz
 %{_firmwarepath}/intel/sof-ipc4-tplg
 
-# Licence: Apache 2.0
-%{_firmwarepath}/intel/avs/*.bin.xz
-
 # Licence: SOF (3-clause BSD plus others)
 # .. for files with suffix .ri
 
diff --git a/sources b/sources
index e67be8d..fb3b019 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
 SHA512 (sof-bin-2024.03.tar.gz) = 1e9891d3891f5a4413a77a68ea6d3a2e6ead8c1a67eaa7e9aaf30871753617ffce19bd3b85ebcbb617e606646f6aa0e1dafee5279c294ec72ef4b2885e009f72
-SHA512 (avs-topology_2024.02.tar.gz) = b7ebce9a6893e44d3c4a41c8e15818f7dac9d3e246c724e9a48514e40e6c43f1791a947b4560fe5ce6eb135232bf5ea8fb1a4d84f83442b7c777e341c977e134