[arch-commits] Commit in deepin-anything/trunk (PKGBUILD linux-4.17.patch)

[Felix Yan]

    Date: Friday, June 22, 2018 @ 15:04:00
  Author: felixonmars
Revision: 344640

upgpkg: deepin-anything 0.0.1-2

fix for 4.17+ kernel

Added:
  deepin-anything/trunk/linux-4.17.patch
Modified:
  deepin-anything/trunk/PKGBUILD

------------------+
 PKGBUILD         |   13 +++++++++---
 linux-4.17.patch |   54 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-22 14:51:20 UTC (rev 344639)
+++ PKGBUILD	2018-06-22 15:04:00 UTC (rev 344640)
@@ -3,7 +3,7 @@
 
 pkgname=deepin-anything
 pkgver=0.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Deepin Anything file search tool"
 arch=('x86_64')
 url="https://github.com/linuxdeepin/deepin-anything"
@@ -10,9 +10,16 @@
 license=('GPL3')
 depends=('dkms')
 groups=('deepin')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-anything/archive/$pkgver.tar.gz")
-sha512sums=('6a210f2b3797647b0bf280ecd97b2d71ff6c882d9cd8d8daadf141b2125c5ade3af4f27086be3c6e68e3f823c0acb4753afbbadcee2cf82b0d18559409b7d64d')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-anything/archive/$pkgver.tar.gz"
+        linux-4.17.patch)
+sha512sums=('6a210f2b3797647b0bf280ecd97b2d71ff6c882d9cd8d8daadf141b2125c5ade3af4f27086be3c6e68e3f823c0acb4753afbbadcee2cf82b0d18559409b7d64d'
+            'fe951583cf18401eef4b8f85c1113dee9de50633da059ad9e0f8f887c9cd8c4a80998bc16d66438efe7ccf8ca524426bf980aa00e4c4b840d1ced10c72da32c9')
 
+prepare() {
+  cd deepin-anything-$pkgver
+  patch -p1 -i ../linux-4.17.patch
+}
+
 build() {
   cd deepin-anything-$pkgver
   make VERSION=$pkgver

Added: linux-4.17.patch
===================================================================
--- linux-4.17.patch	                        (rev 0)
+++ linux-4.17.patch	2018-06-22 15:04:00 UTC (rev 344640)
@@ -0,0 +1,54 @@
+From b3997f5be93f727be2047e8e27ed0b5b3873af55 Mon Sep 17 00:00:00 2001
+From: zccrs <ccrr1314 at live.com>
+Date: Fri, 22 Jun 2018 08:58:22 +0800
+Subject: [PATCH] fix: failed when insert the module on 4.17 version kernel
+
+sys_umount is removed
+see: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3a18ef5c1b3935cb05888fc37964321f7bd6231d
+
+Change-Id: Id865b20514248b432a49c4659bf91b0da037679f
+---
+
+diff --git a/kernelmod/vfs_kretprobes.c b/kernelmod/vfs_kretprobes.c
+index ddc264b..6744a35 100644
+--- a/kernelmod/vfs_kretprobes.c
++++ b/kernelmod/vfs_kretprobes.c
+@@ -8,6 +8,7 @@
+ #include <linux/list.h>
+ #include <linux/uaccess.h>
+ #include <linux/namei.h>
++#include <linux/version.h>
+ 
+ #include "arg_extractor.h"
+ #include "vfs_change_consts.h"
+@@ -18,14 +19,16 @@
+ 	char dir_name[NAME_MAX];
+ } do_mount_args;
+ 
+-#define DECL_CMN_KRP(fn) static struct kretprobe fn##_krp = {\
++#define _DECL_CMN_KRP(fn, symbol) static struct kretprobe fn##_krp = {\
+ 	.entry_handler	= on_##fn##_ent,\
+ 	.handler		= on_##fn##_ret,\
+ 	.data_size		= sizeof(fn##_args),\
+ 	.maxactive		= 64,\
+-	.kp.symbol_name = ""#fn"",\
++	.kp.symbol_name = ""#symbol"",\
+ };
+ 
++#define DECL_CMN_KRP(fn) _DECL_CMN_KRP(fn, fn)
++
+ static DEFINE_SPINLOCK(sl_parts);
+ static LIST_HEAD(partitions);
+ 
+@@ -207,7 +210,11 @@
+ }
+ 
+ DECL_CMN_KRP(do_mount);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)
+ DECL_CMN_KRP(sys_umount);
++#else
++_DECL_CMN_KRP(sys_umount, ksys_umount);
++#endif
+ 
+ typedef struct __vfs_op_args__ {
+ 	unsigned char major, minor;