From 528052f3eaa47b022484cbcc419a7bb5ceda8f35 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Wed, 28 Sep 2016 19:37:30 -0300
Subject: linux-libre-lts-knock: fix RCN patch

---
 kernels/linux-libre-lts-knock/PKGBUILD | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

(limited to 'kernels/linux-libre-lts-knock/PKGBUILD')

diff --git a/kernels/linux-libre-lts-knock/PKGBUILD b/kernels/linux-libre-lts-knock/PKGBUILD
index 9a35ed486..7d67ef2d3 100644
--- a/kernels/linux-libre-lts-knock/PKGBUILD
+++ b/kernels/linux-libre-lts-knock/PKGBUILD
@@ -21,7 +21,7 @@ _srcname=linux-${_pkgbasever%-*}
 _archpkgver=${_pkgver%-*}
 pkgver=${_pkgver//-/_}
 pkgrel=1
-rcnrel=armv7-x10
+rcnrel=armv7-x10.1
 arch=('i686' 'x86_64' 'armv7h')
 url="https://gnunet.org/knock"
 license=('GPL2')
@@ -54,8 +54,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         # armv7h patches
         "https://repo.parabola.nu/other/rcn-libre/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"
         "https://repo.parabola.nu/other/rcn-libre/patches/${_pkgver%-*}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch.sig"
-        '0001-ARM-remove-spin_lock_and_spin_unlock.patch'
-        '0001-ARM-disable-implicit-function-declaration-error.patch'
         '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch'
         '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch'
         '0003-SMILE-Plug-device-tree-file.patch'
@@ -79,17 +77,15 @@ sha256sums=('f53e99866c751f21412737d1f06b0721e207f495c8c64f97dffb681795ee69a0'
             'SKIP'
             '7cbda7707e8edfd28658da3ef3f58f5b6314a483d45757a7b2375d1c0450eaa1'
             '1aa649f7e8001391effb6edc65c8d47bf189301f8cc35fc23515141d8cbca14c'
-            '8170b258ee0ac204df4d248acff3b90126643d19f794d81153250ef47506d474'
+            '40c3c8de4b52ab344415ca1b1efb115fee931b3b146f1f378b7a61598e90149c'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
             '5313df7cb5b4d005422bd4cd0dae956b2dadba8f3db904275aaf99ac53894375'
             'f0a10ea9a669e5200aa33656565c209718b24ff1add03ac5279c4a1f46ab8798'
             '96c6c7d4057b8d08238adae85d476c863c082770a182057163a45480511d35a8'
             '2ca85ee212ef8d8aab3d3c2a0cef304a355d86e7aa520e19471f56ace68a0cf4'
-            '87556459ae306d2e39acdce7e181690ce4d8736deea3c0aac529d0f7c7a284ad'
+            '737924886160c4f28b5198c59a2f2cd261df45417c1faf56b86e57b3f2509026'
             'SKIP'
-            '73af660749be60c2b33ec85e06ffa840f538ca8fc169b96f245767436bdc36ee'
-            '1fc7055041da895d5d023fcf0c5e06d00a3506ae98931138229dba7392e2c382'
             'a851312b26800a7e189b34547d5d4b2b62a18874f07335ac6f426c32b47c3817'
             '486976f36e1919eac5ee984cb9a8d23a972f23f22f8344eda47b487ea91047f4'
             '6dadc17ea56d93ec0f1d0c3c98c25a7863e9ba3c4af50dc411d630a1bcc98f08'
@@ -128,18 +124,13 @@ prepare() {
   patch -p1 -i "${srcdir}/tcp_stealth_${_knockpatchver}.diff"
 
   if [ "${CARCH}" = "armv7h" ]; then
-    # RCN patch (CM3 firmware deblobbed, AUFS and RT removed)
-    # Note: For stability reasons, AUFS and RT have been removed in the RCN patch.
-    # We are supporting AUFS in linux-libre-pck through PCK patch and RT through its official
-    # patch in linux-libre-rt. See https://wiki.parabola.nu/PCK for further details about PCK.
+    # RCN patch (CM3 firmware deblobbed, I2C/IIO/touchscreen backports, AUFS and RT removed)
+    # Note: For stability reasons, I2C/IIO/touchscreen backports, AUFS and RT have been
+    # removed in the RCN patch. We are supporting AUFS in linux-libre-pck through PCK patch
+    # and RT through its official patch in linux-libre-rt. See https://wiki.parabola.nu/PCK
+    # for further details about PCK.
     git apply -v "${srcdir}/rcn-libre-${_pkgver%-*}-${rcnrel}.patch"
 
-    # fix RCN bugs
-    patch -p1 -i "${srcdir}/0001-ARM-remove-spin_lock_and_spin_unlock.patch"
-
-    # disable implicit function declaration error since there are old backports patches
-    patch -p1 -i "${srcdir}/0001-ARM-disable-implicit-function-declaration-error.patch"
-
     # ALARM patches
     patch -p1 -i "${srcdir}/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch"
     patch -p1 -i "${srcdir}/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch"
-- 
cgit v1.2.3-54-g00ecf