[arch-commits] Commit in deepin-anything-arch/repos (4 files)
Jan Steffens
heftig at archlinux.org
Sun Jan 17 23:15:52 UTC 2021
Date: Sunday, January 17, 2021 @ 23:15:52
Author: heftig
Revision: 822022
archrelease: copy trunk to community-testing-x86_64
Added:
deepin-anything-arch/repos/community-testing-x86_64/
deepin-anything-arch/repos/community-testing-x86_64/0001-linux-5.6.patch
(from rev 822016, deepin-anything-arch/trunk/0001-linux-5.6.patch)
deepin-anything-arch/repos/community-testing-x86_64/0002-linux-5.10.patch
(from rev 822018, deepin-anything-arch/trunk/0002-linux-5.10.patch)
deepin-anything-arch/repos/community-testing-x86_64/PKGBUILD
(from rev 822019, deepin-anything-arch/trunk/PKGBUILD)
-----------------------+
0001-linux-5.6.patch | 40 +++++++++++++++++++++++++++++
0002-linux-5.10.patch | 65 ++++++++++++++++++++++++++++++++++++++++++++++++
PKGBUILD | 39 ++++++++++++++++++++++++++++
3 files changed, 144 insertions(+)
Copied: deepin-anything-arch/repos/community-testing-x86_64/0001-linux-5.6.patch (from rev 822016, deepin-anything-arch/trunk/0001-linux-5.6.patch)
===================================================================
--- community-testing-x86_64/0001-linux-5.6.patch (rev 0)
+++ community-testing-x86_64/0001-linux-5.6.patch 2021-01-17 23:15:52 UTC (rev 822022)
@@ -0,0 +1,40 @@
+diff --git a/kernelmod/vfs_change.c b/kernelmod/vfs_change.c
+index 6a0e334..e25faf4 100644
+--- a/kernelmod/vfs_change.c
++++ b/kernelmod/vfs_change.c
+@@ -125,7 +125,11 @@ static ssize_t copy_vfs_changes(struct TIMESTRUCT *last, char* buf, size_t size)
+ ))
+ continue;
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)
+ time_t shifted_secs = vc->ts.tv_sec + hour_shift*3600;
++#else
++ time64_t shifted_secs = vc->ts.tv_sec + hour_shift*3600;
++#endif
+ struct tm ts;
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0)
+ time_to_tm(shifted_secs, 0, &ts);
+@@ -333,6 +337,7 @@ static long ioctl_vfs_changes(struct file* filp, unsigned int cmd, unsigned long
+ }
+ }
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)
+ static struct file_operations procfs_ops = {
+ .owner = THIS_MODULE,
+ .open = open_vfs_changes,
+@@ -342,6 +347,15 @@ static struct file_operations procfs_ops = {
+ //.llseek = generic_file_llseek,
+ .release = release_vfs_changes,
+ };
++#else
++static struct proc_ops procfs_ops = {
++ .proc_open = open_vfs_changes,
++ .proc_read = read_vfs_changes,
++ .proc_ioctl = ioctl_vfs_changes,
++ .proc_lseek = no_llseek,
++ .proc_release = release_vfs_changes,
++};
++#endif
+
+ int __init init_vfs_changes(void)
+ {
Copied: deepin-anything-arch/repos/community-testing-x86_64/0002-linux-5.10.patch (from rev 822018, deepin-anything-arch/trunk/0002-linux-5.10.patch)
===================================================================
--- community-testing-x86_64/0002-linux-5.10.patch (rev 0)
+++ community-testing-x86_64/0002-linux-5.10.patch 2021-01-17 23:15:52 UTC (rev 822022)
@@ -0,0 +1,65 @@
+From 5b6a3aa4ab5207e4c7d85dd076069c146661248b Mon Sep 17 00:00:00 2001
+From: 李成刚 <lichenggang at uniontech.com>
+Date: Thu, 24 Dec 2020 17:36:40 +0800
+Subject: [PATCH] feat: add support for Linux 5.10 Task: https://pms.uniontech.com/zentao/story-view-7528.html
+
+Change-Id: I02c1ec5e29a495cef0a03088e425790e89286160
+---
+
+diff --git a/debian/changelog b/debian/changelog
+index 94f2361..7876d60 100644
+--- a/debian/changelog
++++ b/debian/changelog
+@@ -1,3 +1,9 @@
++deepin-anything (5.0.2+dde) unstable; urgency=medium
++
++ * add support for Linux 5.10.
++
++ -- Deepin Package Builder <lichenggang at uniontech.com> Thu, 24 Dec 2020 17:17:33 +0800
++
+ deepin-anything (20180315+1) unstable; urgency=medium
+
+ * Initial release.
+diff --git a/kernelmod/vfs_utils.c b/kernelmod/vfs_utils.c
+index 2549e10..75139dd 100644
+--- a/kernelmod/vfs_utils.c
++++ b/kernelmod/vfs_utils.c
+@@ -6,6 +6,7 @@
+ #include <linux/slab.h>
+ #include <linux/uaccess.h>
+ #include <linux/file.h>
++#include <linux/version.h>
+
+ #include "vfs_utils.h"
+
+@@ -23,9 +24,13 @@
+ pr_err("error opening %s\n", filename);
+ return 0;
+ }
+- mm_segment_t old_fs = get_fs();
+- set_fs(KERNEL_DS);
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0)
++ mm_segment_t old_fs = force_uaccess_begin();
++#else
++ mm_segment_t old_fs = get_fs();
++ set_fs(KERNEL_DS);
++#endif
+ // i_size_read is useless here because procfs does not have i_size
+ // loff_t size = i_size_read(file_inode(filp));
+ char *buf = 0;
+@@ -46,7 +51,13 @@
+ size += ALLOC_UNIT;
+ kfree(buf);
+ }
+- set_fs(old_fs);
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 10, 0)
++ force_uaccess_end(old_fs);
++#else
++ set_fs(old_fs);
++#endif
++
+ filp_close(filp, 0);
+ // pr_info("%s size: %d\n", filename, *real_size);
+ return buf;
Copied: deepin-anything-arch/repos/community-testing-x86_64/PKGBUILD (from rev 822019, deepin-anything-arch/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2021-01-17 23:15:52 UTC (rev 822022)
@@ -0,0 +1,39 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+
+pkgname=deepin-anything-arch
+pkgver=5.0.1
+pkgrel=137
+pkgdesc="Deepin Anything file search tool, kernel module for Arch kernel"
+arch=('x86_64')
+url="https://github.com/linuxdeepin/deepin-anything"
+license=('GPL3')
+makedepends=('linux-headers')
+provides=('DEEPIN-ANYTHING-MODULE')
+replaces=('deepin-anything-module')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxdeepin/deepin-anything/archive/$pkgver.tar.gz"
+ '0001-linux-5.6.patch'
+ '0002-linux-5.10.patch')
+sha512sums=('f79b4db917cce2611bd6964d00ae0e162fc500fa7ca76a987145456a9ee81296c776d2b83cf6492a4224c4e4fd95df3ad95a25c1c14d2d4e6865f5bbd639be14'
+ '5ddbd2d968bc5b01dbc99648cec81ea072675d7fe7198835649d5b581997945d32bd842dd7ebf60185aa84722b94575ac7aeb5e4616945e22fae53272907305b'
+ '6200580088b6f49a9078119720ddbe4f9fe6faf5bc9d8a51d9a35d30271887f9cf75337f669b2c97cefa8c5d94aae20ddc44350a27a33d503af2ac1170f6a0c9')
+
+prepare() {
+ cd deepin-anything-$pkgver
+ patch -Np1 < ../0001-linux-5.6.patch
+ patch -Np1 < ../0002-linux-5.10.patch
+}
+
+build() {
+ cd deepin-anything-$pkgver
+ make -C kernelmod kdir=/usr/src/linux
+}
+
+package() {
+ depends=('linux')
+
+ cd deepin-anything-$pkgver
+ local extradir=/usr/lib/modules/$(</usr/src/linux/version)/extramodules
+ install -Dt "$pkgdir$extradir" -m644 kernelmod/*.ko
+ find "$pkgdir" -name '*.ko' -exec strip --strip-debug {} +
+ find "$pkgdir" -name '*.ko' -exec xz {} +
+}
More information about the arch-commits
mailing list