[arch-commits] Commit in deepin-anything/repos (6 files)
Felix Yan
felixonmars at archlinux.org
Sun Dec 30 09:12:50 UTC 2018
Date: Sunday, December 30, 2018 @ 09:12:47
Author: felixonmars
Revision: 418972
archrelease: copy trunk to community-testing-x86_64
Added:
deepin-anything/repos/community-testing-x86_64/
deepin-anything/repos/community-testing-x86_64/PKGBUILD
(from rev 418971, deepin-anything/trunk/PKGBUILD)
deepin-anything/repos/community-testing-x86_64/deepin-anything-server.sysusers
(from rev 418971, deepin-anything/trunk/deepin-anything-server.sysusers)
deepin-anything/repos/community-testing-x86_64/fix-include.patch
(from rev 418971, deepin-anything/trunk/fix-include.patch)
deepin-anything/repos/community-testing-x86_64/linux-4.17.patch
(from rev 418971, deepin-anything/trunk/linux-4.17.patch)
deepin-anything/repos/community-testing-x86_64/linux-4.20.patch
(from rev 418971, deepin-anything/trunk/linux-4.20.patch)
---------------------------------+
PKGBUILD | 67 ++++++++++++++++++++++++++++++++++++++
deepin-anything-server.sysusers | 2 +
fix-include.patch | 12 ++++++
linux-4.17.patch | 54 ++++++++++++++++++++++++++++++
linux-4.20.patch | 16 +++++++++
5 files changed, 151 insertions(+)
Copied: deepin-anything/repos/community-testing-x86_64/PKGBUILD (from rev 418971, deepin-anything/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2018-12-30 09:12:47 UTC (rev 418972)
@@ -0,0 +1,67 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgbase=deepin-anything
+pkgname=(deepin-anything deepin-anything-module deepin-anything-dkms)
+pkgver=0.0.3
+_extramodules=extramodules-ARCH
+pkgrel=2
+pkgdesc="Deepin Anything file search tool"
+arch=('x86_64')
+url="https://github.com/linuxdeepin/deepin-anything"
+license=('GPL3')
+makedepends=('qt5-base' 'linux>=4.20' 'linux-headers>=4.20')
+groups=('deepin')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-anything/archive/$pkgver.tar.gz"
+ deepin-anything-server.sysusers
+ fix-include.patch
+ linux-4.20.patch)
+sha512sums=('8a506ba57d6a2ac9c9089719d18013fbde6443cb4f63de79498269e728b7e8725b4e06e7029ae2d2242aaac955c63e56c680fdd18e3fb0d72e9953a9fc5e8402'
+ '0ff6a6de1fbfb0c33eaac511b989da321a9e43ece92708af88aee34ad1a05e55572713b1290bc2705d70b91dc7bec4fb4abd3dc664a0abe01de27d88bd9e9c85'
+ '55498f8b14e1b233b4052d516b880f4c27797eede46481135dcf76808e9f00f4ac4fdd0e2e2d7d478d335fb12b7137ca1bef0745e1c8b4195e025b81eec94d21'
+ 'dc3c85e9535cc589fdf56d265c4330519c92b5bcc406153e3162ba6ef5e799b702c394e1961132770f4f3ddd288dbbfe74a9d8056329e4585eb5a2094ffe0155')
+
+prepare() {
+ cd deepin-anything-$pkgver
+ patch -p1 -i ../fix-include.patch
+ patch -p1 -i ../linux-4.20.patch
+ sed -i 's|^systemd_service.path.*|systemd_service.path = /usr/lib/systemd/system|' server/src/src.pro
+}
+
+build() {
+ _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
+
+ 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')
+
+ cd deepin-anything-$pkgver
+ install -dm 755 "$pkgdir"/usr/src
+ cp -r kernelmod-dkms "$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')
+
+ cd deepin-anything-$pkgver
+ make VERSION=$pkgver DESTDIR="$pkgdir" install
+ rm -r "$pkgdir"/usr/src
+
+ install -Dm644 ../deepin-anything-server.sysusers "$pkgdir/usr/lib/sysusers.d/deepin-anything-server.conf"
+}
Copied: deepin-anything/repos/community-testing-x86_64/deepin-anything-server.sysusers (from rev 418971, deepin-anything/trunk/deepin-anything-server.sysusers)
===================================================================
--- community-testing-x86_64/deepin-anything-server.sysusers (rev 0)
+++ community-testing-x86_64/deepin-anything-server.sysusers 2018-12-30 09:12:47 UTC (rev 418972)
@@ -0,0 +1,2 @@
+u deepin_anything_server - "Deepin Anything Server"
+g deepin_anything_server -
Copied: deepin-anything/repos/community-testing-x86_64/fix-include.patch (from rev 418971, deepin-anything/trunk/fix-include.patch)
===================================================================
--- community-testing-x86_64/fix-include.patch (rev 0)
+++ community-testing-x86_64/fix-include.patch 2018-12-30 09:12:47 UTC (rev 418972)
@@ -0,0 +1,12 @@
+diff --git a/library/src/walkdir.c b/library/src/walkdir.c
+index ffd78df..8319fc0 100644
+--- a/library/src/walkdir.c
++++ b/library/src/walkdir.c
+@@ -6,6 +6,7 @@
+ #include <unistd.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <dirent.h>
+ #include <limits.h>
+
Copied: deepin-anything/repos/community-testing-x86_64/linux-4.17.patch (from rev 418971, deepin-anything/trunk/linux-4.17.patch)
===================================================================
--- community-testing-x86_64/linux-4.17.patch (rev 0)
+++ community-testing-x86_64/linux-4.17.patch 2018-12-30 09:12:47 UTC (rev 418972)
@@ -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;
Copied: deepin-anything/repos/community-testing-x86_64/linux-4.20.patch (from rev 418971, deepin-anything/trunk/linux-4.20.patch)
===================================================================
--- community-testing-x86_64/linux-4.20.patch (rev 0)
+++ community-testing-x86_64/linux-4.20.patch 2018-12-30 09:12:47 UTC (rev 418972)
@@ -0,0 +1,16 @@
+diff --git a/kernelmod/vfs_change.c b/kernelmod/vfs_change.c
+index 0d6d360..d09e439 100644
+--- a/kernelmod/vfs_change.c
++++ b/kernelmod/vfs_change.c
+@@ -115,7 +115,11 @@ static ssize_t copy_vfs_changes(struct timeval *last, char* buf, size_t size)
+
+ time_t shifted_secs = vc->ts.tv_sec + hour_shift*3600;
+ struct tm ts;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0)
+ time_to_tm(shifted_secs, 0, &ts);
++#else
++ time64_to_tm(shifted_secs, 0, &ts);
++#endif
+ char temp[MIN_LINE_SIZE];
+ snprintf(temp, sizeof(temp), "%04ld-%02d-%02d %02d:%02d:%02d.%03ld %s ",
+ 1900+ts.tm_year, 1+ts.tm_mon, ts.tm_mday, ts.tm_hour, ts.tm_min, ts.tm_sec, vc->ts.tv_usec/1000,
More information about the arch-commits
mailing list