Bump version, remove proc_ops patch

The proc_ops patch is not required anymore.

4 files changed, 15 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bcc71a03f4bf..aa32e1cc868f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pivccu-modules-dkms
 	pkgdesc = Kernel modules needed for Homematic
-	pkgver = 1.0.39
-	pkgrel = 2
+	pkgver = 1.0.45
+	pkgrel = 1
 	url = https://github.com/alexreinert/piVCCU/
 	arch = x86_64
 	arch = arm
@@ -11,12 +11,10 @@ pkgbase = pivccu-modules-dkms
 	makedepends = dtc
 	depends = dkms
 	conflicts = pivccu-modules
-	source = pivccu::git+https://github.com/alexreinert/piVCCU#commit=7a692da961423f496ce65164b271a3ef4dd800b2
+	source = pivccu::git+https://github.com/alexreinert/piVCCU#commit=6f2e5791c306655b5ddc2c02bd69bdc597e07dfa
 	source = dkms.conf
-	source = proc_ops.patch
 	sha256sums = SKIP
-	sha256sums = 0440113135ab4b9a2d46859abd2854f831e99da06f9e410c56bef199b7d0a6df
-	sha256sums = ea2b82dae4cd092fa802528261fc88e0e7610c83a8ead7669bbb28b92ee9c6c4
+	sha256sums = 3f821472f7ea0d7e41f7182beb545312da6b03fbade7f00e44f376fdec98580b
 
 pkgname = pivccu-modules-dkms
 
diff --git a/PKGBUILD b/PKGBUILD
index f7686c0caecc..b87d56affa64 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 _pkgbase=pivccu-modules
 pkgname=${_pkgbase}-dkms
-pkgver=1.0.39
-pkgrel=2
+pkgver=1.0.45
+pkgrel=1
 pkgdesc="Kernel modules needed for Homematic"
 arch=('x86_64' 'arm' 'armv6h' 'armv7h')
 url="https://github.com/alexreinert/piVCCU/"
@@ -11,17 +11,10 @@ license=('GPL')
 depends=('dkms')
 makedepends=('dtc')
 conflicts=("${_pkgbase}")
-source=("pivccu::git+https://github.com/alexreinert/piVCCU#commit=7a692da961423f496ce65164b271a3ef4dd800b2"
-        "dkms.conf"
-        "proc_ops.patch")
+source=("pivccu::git+https://github.com/alexreinert/piVCCU#commit=6f2e5791c306655b5ddc2c02bd69bdc597e07dfa"
+        "dkms.conf")
 sha256sums=('SKIP'
-            '0440113135ab4b9a2d46859abd2854f831e99da06f9e410c56bef199b7d0a6df'
-            'ea2b82dae4cd092fa802528261fc88e0e7610c83a8ead7669bbb28b92ee9c6c4')
-
-prepare() {
-    cd "$srcdir/pivccu/"
-    patch -p1 < "$srcdir/proc_ops.patch"
-}
+            '3f821472f7ea0d7e41f7182beb545312da6b03fbade7f00e44f376fdec98580b')
 
 package() {
     install -Dm644 -t "${pkgdir}"/usr/src/${_pkgbase}-${pkgver}/ \
diff --git a/dkms.conf b/dkms.conf
index 30b047f7ec76..194ae05f562b 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -24,3 +24,9 @@ BUILT_MODULE_NAME[8]="led_trigger_timer"
 DEST_MODULE_LOCATION[8]="/extra/pivccu3"
 BUILT_MODULE_NAME[9]="hb_rf_usb"
 DEST_MODULE_LOCATION[9]="/extra/pivccu3"
+BUILT_MODULE_NAME[10]="hb_rf_usb-2"
+DEST_MODULE_LOCATION[10]="/extra/pivccu3"
+BUILT_MODULE_NAME[11]="hb_rf_eth"
+DEST_MODULE_LOCATION[11]="/extra/pivccu3"
+BUILT_MODULE_NAME[12]="rtc-rx8130"
+DEST_MODULE_LOCATION[12]="/extra/pivccu3"
diff --git a/proc_ops.patch b/proc_ops.patch
deleted file mode 100644
index 35075d6364f9..000000000000
--- a/proc_ops.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/kernel/generic_raw_uart.c b/kernel/generic_raw_uart.c
-index 5076fa8..eda7f4d 100644
---- a/kernel/generic_raw_uart.c
-+++ b/kernel/generic_raw_uart.c
-@@ -133,13 +133,12 @@ static struct file_operations generic_raw_uart_fops =
- };
- 
- #ifdef PROC_DEBUG
--static const struct file_operations generic_raw_uart_proc_fops =
-+static const struct proc_ops generic_raw_uart_proc_fops =
- {
--  .owner = THIS_MODULE,
--  .open = generic_raw_uart_proc_open,
--  .read = seq_read,
--  .llseek = seq_lseek,
--  .release = single_release,
-+  .proc_open = generic_raw_uart_proc_open,
-+  .proc_read = seq_read,
-+  .proc_lseek = seq_lseek,
-+  .proc_release = single_release,
- };
- #endif /*PROC_DEBUG*/
-