cyber-dkms: update to new upstream releasemaster

4 files changed, 11 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 47b445b..054a83f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,17 @@
 pkgbase = cyber-dkms
 	pkgdesc = CYBER for your system (DKMS)
-	pkgver = 42.1729.1939
+	pkgver = 42.1815
 	pkgrel = 1
 	url = https://github.com/fmorgner/dev-cyber
 	arch = i686
 	arch = x86_64
 	license = GPL2
 	depends = dkms
-	source = https://github.com/fmorgner/dev-cyber/archive/v42.1729.1939.tar.gz
+	source = https://github.com/fmorgner/dev-cyber/archive/v42.1815.tar.gz
 	source = dkms.conf
-	source = uaccess.patch
 	source = 10-cyber.conf
-	sha256sums = 5557597bc6c60335388e31ec50282725b25e7d13ce39b35ad9520db34e4a54a3
-	sha256sums = d976032e9f79a5cc679872b48e1c38124411891b6ce01527bfe24ff8f3df3a16
-	sha256sums = 365d11440e7dfaf281ad6d844a0f93a2f7eaca68880bfa89da5c58aaba0164e5
+	sha256sums = bbdcda5d30d972300b0bf6f4856e6e25120dce3b71642de8bd7b38a7c05ab18d
+	sha256sums = 44a852c8ce455d9345f927e4daa194b41de2e67c4cdaf6f2fe870c92a1739541
 	sha256sums = 99100ac04db2147ef246377b1ea4fc0c17106d37286e5d61cc02201301a85bbb
 
 pkgname = cyber-dkms
diff --git a/PKGBUILD b/PKGBUILD
index c7e28ae..22f4935 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 _pkgname=cyber
 pkgname=${_pkgname}-dkms
-pkgver=42.1729.1939
+pkgver=42.1815
 pkgrel=1
 pkgdesc="CYBER for your system (DKMS)"
 arch=('i686' 'x86_64')
@@ -11,18 +11,14 @@ license=('GPL2')
 depends=('dkms')
 source=("https://github.com/fmorgner/dev-cyber/archive/v${pkgver}.tar.gz"
         "dkms.conf"
-        "uaccess.patch"
         "10-cyber.conf")
-sha256sums=('5557597bc6c60335388e31ec50282725b25e7d13ce39b35ad9520db34e4a54a3'
-            'd976032e9f79a5cc679872b48e1c38124411891b6ce01527bfe24ff8f3df3a16'
-            '365d11440e7dfaf281ad6d844a0f93a2f7eaca68880bfa89da5c58aaba0164e5'
+sha256sums=('bbdcda5d30d972300b0bf6f4856e6e25120dce3b71642de8bd7b38a7c05ab18d'
+            '44a852c8ce455d9345f927e4daa194b41de2e67c4cdaf6f2fe870c92a1739541'
             '99100ac04db2147ef246377b1ea4fc0c17106d37286e5d61cc02201301a85bbb')
 
 package() {
   cd "${srcdir}"
 
-  (cd "${srcdir}/dev-${_pkgname}-${pkgver}" && patch -p1 -i "${srcdir}/uaccess.patch")
-
   local install_dir="${pkgdir}/usr/src/${_pkgname}-${pkgver}"
 
   install -Dm644 10-cyber.conf "${pkgdir}/etc/modules-load.d/10-cyber.conf"
@@ -35,11 +31,11 @@ package() {
 
   cd "dev-${_pkgname}-${pkgver}"
 
-  for d in $(find . -type d); do
+  for d in $(find . -type d -and -not -name '.vscode' ); do
     install -dm755 "${install_dir}/$d"
   done
 
-  for f in $(find . -type f); do
+  for f in $(find . -path './.vscode' -prune -prune -or \( -type f -and -not -name '.gitignore' -and -print \)); do
     install -m644 "$f" "${install_dir}/$f"
   done
 }
diff --git a/dkms.conf b/dkms.conf
index e461c98..3215289 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,6 +1,7 @@
 PACKAGE_NAME="@_PKGBASE@"
 PACKAGE_VERSION="@PKGVER@"
-MAKE[0]="make KERNEL_VERSION=$kernelver"
+MAKE[0]="'make'"
 BUILT_MODULE_NAME[0]="@_PKGBASE@"
+BUILT_MODULE_LOCATION[0]="mod"
 DEST_MODULE_LOCATION[0]="/extra"
 AUTOINSTALL="yes"
diff --git a/uaccess.patch b/uaccess.patch
deleted file mode 100644
index 9dda028..0000000
--- a/uaccess.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/cyber_file.c b/src/cyber_file.c
-index 4ff5581..7f63d5d 100644
---- a/src/cyber_file.c
-+++ b/src/cyber_file.c
-@@ -18,7 +18,7 @@
- #include "cyber.h"
- #include "cyber_file.h"
- 
--#include <asm/uaccess.h>
-+#include <linux/uaccess.h>
- #include <linux/module.h>
- #include <linux/fs.h>
- #include <linux/mm.h>