New upstream version, add support for kernel 5.10

3 files changed, 38 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6a5618087b59..90759734b201 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pivccu-modules-dkms
 	pkgdesc = Kernel modules needed for Homematic
-	pkgver = 1.0.51
+	pkgver = 1.0.56
 	pkgrel = 1
 	url = https://github.com/alexreinert/piVCCU/
 	arch = x86_64
@@ -11,10 +11,12 @@ pkgbase = pivccu-modules-dkms
 	makedepends = dtc
 	depends = dkms
 	conflicts = pivccu-modules
-	source = pivccu::git+https://github.com/alexreinert/piVCCU#commit=e28798598aff858fb88b00e7d0918da31cb28795
+	source = pivccu::git+https://github.com/alexreinert/piVCCU#commit=735b915a5828aabbee79cfafd0173240d823b90c
 	source = dkms.conf
+	source = kernel-5-10.patch
 	sha256sums = SKIP
 	sha256sums = 3f821472f7ea0d7e41f7182beb545312da6b03fbade7f00e44f376fdec98580b
+	sha256sums = 344498daef9cdbb2433213c24357ac4f7080e1b086482b01a2898d5e309cfaa0
 
 pkgname = pivccu-modules-dkms
 
diff --git a/PKGBUILD b/PKGBUILD
index 343b11b40849..6c08a405c62e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgbase=pivccu-modules
 pkgname=${_pkgbase}-dkms
-pkgver=1.0.51
+pkgver=1.0.56
 pkgrel=1
 pkgdesc="Kernel modules needed for Homematic"
 arch=('x86_64' 'arm' 'armv6h' 'armv7h')
@@ -11,10 +11,17 @@ license=('GPL')
 depends=('dkms')
 makedepends=('dtc')
 conflicts=("${_pkgbase}")
-source=("pivccu::git+https://github.com/alexreinert/piVCCU#commit=e28798598aff858fb88b00e7d0918da31cb28795"
-        "dkms.conf")
+source=("pivccu::git+https://github.com/alexreinert/piVCCU#commit=735b915a5828aabbee79cfafd0173240d823b90c"
+        "dkms.conf"
+        "kernel-5-10.patch")
 sha256sums=('SKIP'
-            '3f821472f7ea0d7e41f7182beb545312da6b03fbade7f00e44f376fdec98580b')
+            '3f821472f7ea0d7e41f7182beb545312da6b03fbade7f00e44f376fdec98580b'
+            '344498daef9cdbb2433213c24357ac4f7080e1b086482b01a2898d5e309cfaa0')
+
+prepare() {
+    cd pivccu
+    patch --forward --strip=1 --input="${srcdir}/kernel-5-10.patch"
+}
 
 package() {
     install -Dm644 -t "${pkgdir}"/usr/src/${_pkgbase}-${pkgver}/ \
diff --git a/kernel-5-10.patch b/kernel-5-10.patch
new file mode 100644
index 000000000000..ac9d9b696f4c
--- /dev/null
+++ b/kernel-5-10.patch
@@ -0,0 +1,23 @@
+--- a/kernel/hb_rf_eth.c	2021-02-12 12:23:18.513015122 +0100
++++ b/kernel/hb_rf_eth.c	2021-02-12 12:37:43.583180475 +0100
+@@ -183,8 +183,10 @@
+   struct timeval tv = { .tv_sec = 0, .tv_usec = 100000 };
+ #endif
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
+   mm_segment_t fs = get_fs();
+   set_fs(KERNEL_DS);
++#endif
+ 
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
+   sock_setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO_NEW, KERNEL_SOCKPTR((char *)&tv), sizeof(tv));
+@@ -194,7 +196,9 @@
+   sock_setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (char *)&tv, sizeof(tv));
+ #endif
+ 
++#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0))
+   set_fs(fs);
++#endif
+ }
+ 
+ static void hb_rf_eth_send_msg(struct socket *sock, char *buffer, size_t len)