summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Kitsinger (SwooshyCueb)2017-03-20 19:32:51 -0500
committerMarkus Kitsinger (SwooshyCueb)2017-03-20 19:32:51 -0500
commite4f6c000ff8f051cd0cac738fe0314852970cdaf (patch)
tree4d0aee61543f7140621dfa7d4de42b52690243d6
parent43a8c3cb76d0bb2c6bd380cdab1a87bfd0f99c57 (diff)
downloadaur-e4f6c000ff8f051cd0cac738fe0314852970cdaf.tar.gz
Update for kernel 4.10 (untested)
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
-rw-r--r--vmblock.patch10
3 files changed, 11 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b2e3ae98a083..0dbd41663905 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Mar 21 00:24:04 UTC 2017
+# Tue Mar 21 00:32:24 UTC 2017
pkgbase = vmware-modules-dkms
pkgdesc = VMware Workstation kernel modules (DKMS)
pkgver = 308.0
- pkgrel = 14
+ pkgrel = 15
url = http://www.vmware.com/
install = vmware-modules-dkms.install
arch = i686
@@ -26,7 +26,7 @@ pkgbase = vmware-modules-dkms
sha256sums = 493ff26082307ff58f19b391c5a72625d7071ad12fed9232f0f2e2d4339c3a45
sha256sums = 7baecdfd979d57aed7dac0db57e0165fc1730b15ed6bf42ed25571e68ec34b52
sha256sums = 489ab58c7bc605588271f41e563c4e97ea65798fbc4ab7ec5b2135c79df5de1a
- sha256sums = b81a2c26a6af145a934118a0d19d22ff7a73464dfa849d24ba0dd785f119ae7e
+ sha256sums = a7884128131bcd333ffaf235042be71064b41d869064b1d9e122c71368049c2d
sha256sums = f24586ccb45106322bcff9dff92ef2caf9f32c73f2ec1c67f178c7ee2559ac0e
sha256sums = 614c337174257e3b62a8dcf536f8a3b29695b610cb2d22609d39ccc8d671e8ec
sha256sums = 27c375bffdfc141461da77acf80109b3477616bf39b89e4c5cf8e05e1579f6dc
diff --git a/PKGBUILD b/PKGBUILD
index ae70110a67a6..855c64f8f90a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
pkgname=vmware-modules-dkms
_pkgbase=vmware-modules
pkgver=308.0
-pkgrel=14
+pkgrel=15
pkgdesc="VMware Workstation kernel modules (DKMS)"
arch=('i686' 'x86_64')
url="http://www.vmware.com/"
@@ -37,7 +37,7 @@ source=('Makefile'
sha256sums=('493ff26082307ff58f19b391c5a72625d7071ad12fed9232f0f2e2d4339c3a45'
'7baecdfd979d57aed7dac0db57e0165fc1730b15ed6bf42ed25571e68ec34b52'
'489ab58c7bc605588271f41e563c4e97ea65798fbc4ab7ec5b2135c79df5de1a'
- 'b81a2c26a6af145a934118a0d19d22ff7a73464dfa849d24ba0dd785f119ae7e'
+ 'a7884128131bcd333ffaf235042be71064b41d869064b1d9e122c71368049c2d'
'f24586ccb45106322bcff9dff92ef2caf9f32c73f2ec1c67f178c7ee2559ac0e'
'614c337174257e3b62a8dcf536f8a3b29695b610cb2d22609d39ccc8d671e8ec'
'27c375bffdfc141461da77acf80109b3477616bf39b89e4c5cf8e05e1579f6dc'
diff --git a/vmblock.patch b/vmblock.patch
index cad47e8d6a2f..e8e7223de22f 100644
--- a/vmblock.patch
+++ b/vmblock.patch
@@ -262,7 +262,7 @@ index d7ac1f6..c5e6604 100644
.release = FileOpRelease,
};
diff --git a/vmblock/linux/inode.c b/vmblock/linux/inode.c
-index 098c94c..bd2bf01 100644
+index 098c94c..7aed6e7 100644
--- a/vmblock/linux/inode.c
+++ b/vmblock/linux/inode.c
@@ -35,13 +35,24 @@
@@ -334,7 +334,7 @@ index 098c94c..bd2bf01 100644
inode->i_op = &LinkInodeOps;
d_add(dentry, inode);
-@@ -176,8 +200,13 @@ InodeOpReadlink(struct dentry *dentry, // IN : dentry of symlink
+@@ -176,8 +200,15 @@ InodeOpReadlink(struct dentry *dentry, // IN : dentry of symlink
if (!iinfo) {
return -EINVAL;
}
@@ -343,13 +343,15 @@ index 098c94c..bd2bf01 100644
return vfs_readlink(dentry, buffer, buflen, iinfo->name);
+#elif LINUX_VERSION_CODE <= KERNEL_VERSION(4, 6, 99)
+ return readlink_copy(buffer, buflen, iinfo->name);
-+#else
++#elif LINUX_VERSION_CODE <= KERNEL_VERSION(4, 9, 99)
+ return generic_readlink(dentry, buffer, buflen);
++#else
++ return vfs_readlink(dentry, buffer, buflen);
+#endif
}
-@@ -198,30 +227,58 @@ InodeOpReadlink(struct dentry *dentry, // IN : dentry of symlink
+@@ -198,30 +229,58 @@ InodeOpReadlink(struct dentry *dentry, // IN : dentry of symlink
*----------------------------------------------------------------------------
*/