summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Morgner2017-12-31 19:18:37 +0100
committerFelix Morgner2017-12-31 19:18:37 +0100
commit72f5174e4a05c55646d46812889ab5faeed55ccb (patch)
tree9e1e196fc576c2fd02aa7caefc75d5ae4931cf9a
parent6bb2861fe6e96e898a3cd3e710a58235a35ee832 (diff)
downloadaur-72f5174e4a05c55646d46812889ab5faeed55ccb.tar.gz
cyber-dkms: patch uaccess changes
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD6
-rw-r--r--uaccess.patch13
3 files changed, 21 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9571e4915ba0..0fcbcf349166 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = cyber-dkms
pkgdesc = CYBER for your system (DKMS)
pkgver = 42.1729.1812
- pkgrel = 3
+ pkgrel = 4
url = https://github.com/fmorgner/dev-cyber
arch = i686
arch = x86_64
@@ -9,9 +9,11 @@ pkgbase = cyber-dkms
depends = dkms
source = https://github.com/fmorgner/dev-cyber/archive/v42.1729.1812.tar.gz
source = dkms.conf
+ source = uaccess.patch
source = 10-cyber.conf
sha256sums = ffb268642b5823fc4f15a3d91c575c03f66c13d286d80dd09c2d94e9011b1e34
sha256sums = d976032e9f79a5cc679872b48e1c38124411891b6ce01527bfe24ff8f3df3a16
+ sha256sums = 365d11440e7dfaf281ad6d844a0f93a2f7eaca68880bfa89da5c58aaba0164e5
sha256sums = 99100ac04db2147ef246377b1ea4fc0c17106d37286e5d61cc02201301a85bbb
pkgname = cyber-dkms
diff --git a/PKGBUILD b/PKGBUILD
index 270dc085b924..19f0f39e877e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
_pkgname=cyber
pkgname=${_pkgname}-dkms
pkgver=42.1729.1812
-pkgrel=3
+pkgrel=4
pkgdesc="CYBER for your system (DKMS)"
arch=('i686' 'x86_64')
url="https://github.com/fmorgner/dev-cyber"
@@ -11,14 +11,18 @@ license=('GPL2')
depends=('dkms')
source=("https://github.com/fmorgner/dev-cyber/archive/v${pkgver}.tar.gz"
"dkms.conf"
+ "uaccess.patch"
"10-cyber.conf")
sha256sums=('ffb268642b5823fc4f15a3d91c575c03f66c13d286d80dd09c2d94e9011b1e34'
'd976032e9f79a5cc679872b48e1c38124411891b6ce01527bfe24ff8f3df3a16'
+ '365d11440e7dfaf281ad6d844a0f93a2f7eaca68880bfa89da5c58aaba0164e5'
'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"
diff --git a/uaccess.patch b/uaccess.patch
new file mode 100644
index 000000000000..9dda0289ba51
--- /dev/null
+++ b/uaccess.patch
@@ -0,0 +1,13 @@
+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>