Add patch to fix compilation on linux 5.17

3 files changed, 41 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7628a31e4eed..c2a4463f7aa0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pivccu-modules-dkms
 	pkgdesc = Kernel modules needed for Homematic
 	pkgver = 1.0.68
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/alexreinert/piVCCU/
 	arch = x86_64
 	arch = arm
@@ -12,8 +12,10 @@ pkgbase = pivccu-modules-dkms
 	depends = dkms
 	conflicts = pivccu-modules
 	source = pivccu::git+https://github.com/alexreinert/piVCCU#commit=04a72ced0287938c926dbecdc2eb6b506aa3dd50
+	source = kernel-5-17.patch
 	source = dkms.conf
 	sha256sums = SKIP
+	sha256sums = 76ac6067ec9d98f36ede54d158b2ad4e61c737cdb8f99b0cbd2e2234e777f595
 	sha256sums = 3f821472f7ea0d7e41f7182beb545312da6b03fbade7f00e44f376fdec98580b
 
 pkgname = pivccu-modules-dkms
diff --git a/PKGBUILD b/PKGBUILD
index 7a4670bbde17..b48d3c113ad5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _pkgbase=pivccu-modules
 pkgname=${_pkgbase}-dkms
 pkgver=1.0.68
-pkgrel=1
+pkgrel=2
 pkgdesc="Kernel modules needed for Homematic"
 arch=('x86_64' 'arm' 'armv6h' 'armv7h')
 url="https://github.com/alexreinert/piVCCU/"
@@ -11,11 +11,18 @@ license=('GPL')
 depends=('dkms')
 makedepends=('dtc')
 conflicts=("${_pkgbase}")
-source=("pivccu::git+https://github.com/alexreinert/piVCCU#commit=04a72ced0287938c926dbecdc2eb6b506aa3dd50"
-        "dkms.conf")
+source=('pivccu::git+https://github.com/alexreinert/piVCCU#commit=04a72ced0287938c926dbecdc2eb6b506aa3dd50'
+        'kernel-5-17.patch'
+        'dkms.conf')
 sha256sums=('SKIP'
+            '76ac6067ec9d98f36ede54d158b2ad4e61c737cdb8f99b0cbd2e2234e777f595'
             '3f821472f7ea0d7e41f7182beb545312da6b03fbade7f00e44f376fdec98580b')
 
+prepare() {
+    cd pivccu
+    patch --forward --strip=1 --input="${srcdir}/kernel-5-17.patch"
+}
+
 package() {
     install -Dm644 -t "${pkgdir}"/usr/src/${_pkgbase}-${pkgver}/ \
         pivccu/kernel/* dkms.conf
diff --git a/kernel-5-17.patch b/kernel-5-17.patch
new file mode 100644
index 000000000000..940fa098494e
--- /dev/null
+++ b/kernel-5-17.patch
@@ -0,0 +1,28 @@
+From 858adcb3fda0c24ea0b738dcedcc531191889415 Mon Sep 17 00:00:00 2001
+From: Alexander Sulfrian <asulfrian@zedat.fu-berlin.de>
+Date: Fri, 1 Apr 2022 11:46:18 +0200
+Subject: [PATCH] Fix compilation on 5.17
+
+---
+ kernel/generic_raw_uart.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/kernel/generic_raw_uart.c b/kernel/generic_raw_uart.c
+index f61b338..b730bf4 100644
+--- a/kernel/generic_raw_uart.c
++++ b/kernel/generic_raw_uart.c
+@@ -773,7 +773,11 @@ static int generic_raw_uart_proc_show(struct seq_file *m, void *v)
+ 
+ static int generic_raw_uart_proc_open(struct inode *inode, struct file *file)
+ {
++#ifdef PDE_DATA
+   struct generic_raw_uart_instance *instance = PDE_DATA(inode);
++#else
++  struct generic_raw_uart_instance *instance = pde_data(inode);
++#endif
+   return single_open(file, generic_raw_uart_proc_show, instance);
+ }
+ #endif /*PROC_DEBUG*/
+-- 
+2.35.1
+