From 0ba703e2baf165b7f70057f2bbb95678bc952e29 Mon Sep 17 00:00:00 2001
From: Idris Kalp <idriskalp@gmail.com>
Date: Sun, 27 Dec 2020 20:38:15 +0300
Subject: [PATCH] Revert "linux-firmware 20201218"

This reverts commit 41cd725cc79aa1c3ba436ced6acfc44cf9cb2ef5.
---
 hardware/firmware/linux-firmware/actions.py |  2 +-
 hardware/firmware/linux-firmware/pspec.xml  | 29 ++++++++-------------
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/hardware/firmware/linux-firmware/actions.py b/hardware/firmware/linux-firmware/actions.py
index 82c49848..3fd0582c 100644
--- a/hardware/firmware/linux-firmware/actions.py
+++ b/hardware/firmware/linux-firmware/actions.py
@@ -9,7 +9,7 @@ from pisi.actionsapi import autotools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import get
 
-WorkDir = "linux-firmware-%s" %get.srcVERSION()
+WorkDir = "linux-firmware"
 NoStrip = ["/lib"]
 
 def setup():
diff --git a/hardware/firmware/linux-firmware/pspec.xml b/hardware/firmware/linux-firmware/pspec.xml
index 4d5eae6c..95b99948 100644
--- a/hardware/firmware/linux-firmware/pspec.xml
+++ b/hardware/firmware/linux-firmware/pspec.xml
@@ -17,17 +17,17 @@
         <IsA>data</IsA>
         <Summary>Firmware files used by the Linux kernel</Summary>
         <Description>linux-firmware contains different firmware files required for some devices to operate correctly.</Description>
-        <Archive sha1sum="b68537ab75dc2c3351d782b06b26f2a9a79403a1" type="targz">https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-20201218.tar.gz</Archive>
-        <Archive sha1sum="dd685266f7bc0acb0d455462637d23e3e895bc96" type="tarxz" target="linux-firmware-20201218/mix">http://source.pisilinux.org/common-fw/common-fw.tar.xz</Archive>
-        <Archive sha1sum="b2bb7fce3ea67d131f543a48134f7a65f2a8d834" type="tarxz" target="linux-firmware-20201218/mix">http://source.pisilinux.org/firmware-ipw/firmware-ipw.tar.xz</Archive>
-        <Archive sha1sum="a5a616a9f765cf9cbb224deb7ccefdc82a7fe4d9" type="tarbz2" target="linux-firmware-20201218/mix">http://source.pisilinux.org/firmware-nonfreebox/firmware-nonfreebox-2-tar.bz2</Archive>
-        <Archive sha1sum="6c18b28e62637fb809eaff89fff623ae1d470500" type="tarbz2" target="linux-firmware-20201218/mix">http://source.pisilinux.org/ar9170/ar9170.tar.bz2</Archive>
-        <Archive sha1sum="aa3b414c2948be5f226a25fa5f37e56fd659a3bb" type="tarbz2" target="linux-firmware-20201218/mix">http://source.pisilinux.org/ipw2x00-firmware/ipw2x00-firmware.tar.bz2</Archive>
-        <Archive sha1sum="f7ecf5412b7818871fa2798f1b314f8ddddb494e" type="tarbz2" target="linux-firmware-20201218/mix">http://source.pisilinux.org/aic94xx/aic94xx-seq.tar.bz2</Archive>
-        <Archive sha1sum="16d5f4dcc90f978732a9a5b3b0347672a6cc4c36" type="tarbz2" target="linux-firmware-20201218/mix">http://source.pisilinux.org/accessrunner/accessrunner-firmware.tar.bz2</Archive>
-        <Archive sha1sum="e40729d30ad6d7a6c88b90ee7bc5fbaeb9458cb7" type="tarbz2" target="linux-firmware-20201218/mix">http://source.pisilinux.org/rtl8192se/rtl8192se-firmware.tar.bz2</Archive>
-        <Archive sha1sum="ff9e7f4b120476a90cd3fb69d76240166c4ff2a5" type="tarbz2" target="linux-firmware-20201218/mix">http://sourceforge.net/projects/pisilinux/files/source/zd12x1.tar.bz2</Archive>
-        <Archive sha1sum="3239212ae7c5f60baa749764dcb8f5189e1e2f13" type="tarxz" target="linux-firmware-20201218/mix">http://sourceforge.net/projects/pisilinux/files/source/nouveau-340-32.tar.xz</Archive>
+        <Archive sha1sum="9313317db68525a3928f64c082eb1a22305b89fb" type="tarxz">https://sourceforge.net/projects/pisilinux/files/source/linux-firmware-20191220.tar.xz</Archive>
+        <Archive sha1sum="dd685266f7bc0acb0d455462637d23e3e895bc96" type="tarxz" target="linux-firmware/mix">http://source.pisilinux.org/common-fw/common-fw.tar.xz</Archive>
+        <Archive sha1sum="b2bb7fce3ea67d131f543a48134f7a65f2a8d834" type="tarxz" target="linux-firmware/mix">http://source.pisilinux.org/firmware-ipw/firmware-ipw.tar.xz</Archive>
+        <Archive sha1sum="a5a616a9f765cf9cbb224deb7ccefdc82a7fe4d9" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/firmware-nonfreebox/firmware-nonfreebox-2-tar.bz2</Archive>
+        <Archive sha1sum="6c18b28e62637fb809eaff89fff623ae1d470500" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/ar9170/ar9170.tar.bz2</Archive>
+        <Archive sha1sum="aa3b414c2948be5f226a25fa5f37e56fd659a3bb" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/ipw2x00-firmware/ipw2x00-firmware.tar.bz2</Archive>
+        <Archive sha1sum="f7ecf5412b7818871fa2798f1b314f8ddddb494e" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/aic94xx/aic94xx-seq.tar.bz2</Archive>
+        <Archive sha1sum="16d5f4dcc90f978732a9a5b3b0347672a6cc4c36" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/accessrunner/accessrunner-firmware.tar.bz2</Archive>
+        <Archive sha1sum="e40729d30ad6d7a6c88b90ee7bc5fbaeb9458cb7" type="tarbz2" target="linux-firmware/mix">http://source.pisilinux.org/rtl8192se/rtl8192se-firmware.tar.bz2</Archive>
+        <Archive sha1sum="ff9e7f4b120476a90cd3fb69d76240166c4ff2a5" type="tarbz2" target="linux-firmware/mix">http://sourceforge.net/projects/pisilinux/files/source/zd12x1.tar.bz2</Archive>
+        <Archive sha1sum="3239212ae7c5f60baa749764dcb8f5189e1e2f13" type="tarxz" target="linux-firmware/mix">http://sourceforge.net/projects/pisilinux/files/source/nouveau-340-32.tar.xz</Archive>
         <AdditionalFiles>
             <!--AdditionalFile target="intel/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq">fw/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq</AdditionalFile-->
             <AdditionalFile target="iwlwifi-7260-14.ucode">iwlwifi-7260-14.ucode</AdditionalFile>
@@ -48,13 +48,6 @@
     </Package>
 
     <History>
-        <Update release="11">
-            <Date>2020-12-27</Date>
-            <Version>20201218</Version>
-            <Comment>Version bump</Comment>
-            <Name>İdris Kalp</Name>
-            <Email>idriskalp@gmail.com</Email>
-        </Update>
         <Update release="10">
             <Date>2020-12-09</Date>
             <Version>20191220</Version>