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

[Felix Yan]

    Date: Monday, January 14, 2019 @ 12:39:20
  Author: felixonmars
Revision: 423066

upgpkg: deepin-anything 0.0.3-4

split the binary kernel module to a separate package

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

------------------+
 PKGBUILD         |   23 +++++-----------------
 linux-4.17.patch |   54 -----------------------------------------------------
 2 files changed, 6 insertions(+), 71 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-14 12:38:52 UTC (rev 423065)
+++ PKGBUILD	2019-01-14 12:39:20 UTC (rev 423066)
@@ -1,10 +1,10 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgbase=deepin-anything
-pkgname=(deepin-anything deepin-anything-module deepin-anything-dkms)
+pkgname=(deepin-anything deepin-anything-dkms)
 pkgver=0.0.3
 _extramodules=extramodules-ARCH
-pkgrel=3
+pkgrel=4
 pkgdesc="Deepin Anything file search tool"
 arch=('x86_64')
 url="https://github.com/linuxdeepin/deepin-anything"
@@ -32,32 +32,21 @@
 
   cd deepin-anything-$pkgver
   make VERSION=$pkgver
-  cp -r kernelmod kernelmod-dkms
-  make -C kernelmod kdir=/usr/lib/modules/$_kernver/build
 }
 
-package_deepin-anything-module() {
-  depends=('linux>=4.20' 'linux<4.21')
-
-  cd deepin-anything-$pkgver/kernelmod
-  install -dm 755 "$pkgdir"/usr/lib/{modules/$_extramodules,modules-load.d}
-  install -m 644 vfs_monitor.ko "$pkgdir"/usr/lib/modules/$_extramodules/
-  gzip "$pkgdir"/usr/lib/modules/$_extramodules/vfs_monitor.ko
-}
-
 package_deepin-anything-dkms() {
   depends=('dkms')
-  provides=('deepin-anything-module')
-  conflicts=('deepin-anything-module')
+  provides=('DEEPIN-ANYTHING-MODULE')
+  conflicts=('DEEPIN-ANYTHING-MODULE')
 
   cd deepin-anything-$pkgver
   install -dm 755 "$pkgdir"/usr/src
-  cp -r kernelmod-dkms "$pkgdir"/usr/src/deepin-anything-$pkgver
+  cp -r kernelmod "$pkgdir"/usr/src/deepin-anything-$pkgver
   install -m644 debian/deepin-anything-dkms.dkms "$pkgdir"/usr/src/deepin-anything-$pkgver/dkms.conf
 }
 
 package_deepin-anything() {
-  depends=('deepin-anything-module' 'qt5-base')
+  depends=('DEEPIN-ANYTHING-MODULE' 'qt5-base')
 
   cd deepin-anything-$pkgver
   make VERSION=$pkgver DESTDIR="$pkgdir" install

Deleted: linux-4.17.patch
===================================================================
--- linux-4.17.patch	2019-01-14 12:38:52 UTC (rev 423065)
+++ linux-4.17.patch	2019-01-14 12:39:20 UTC (rev 423066)
@@ -1,54 +0,0 @@
-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;