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

[Felix Yan]

    Date: Monday, December 28, 2020 @ 13:18:07
  Author: felixonmars
Revision: 794892

upgpkg: deepin-anything 5.0.1-4: add fix for linux 5.10

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

-----------------------+
 0002-linux-5.10.patch |   65 ++++++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD              |    5 ++-
 2 files changed, 69 insertions(+), 1 deletion(-)

Added: 0002-linux-5.10.patch
===================================================================
--- 0002-linux-5.10.patch	                        (rev 0)
+++ 0002-linux-5.10.patch	2020-12-28 13:18:07 UTC (rev 794892)
@@ -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;

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-28 13:17:34 UTC (rev 794891)
+++ PKGBUILD	2020-12-28 13:18:07 UTC (rev 794892)
@@ -4,7 +4,7 @@
 pkgname=(deepin-anything deepin-anything-dkms)
 pkgver=5.0.1
 _extramodules=extramodules-ARCH
-pkgrel=3
+pkgrel=4
 pkgdesc="Deepin Anything file search tool"
 arch=('x86_64')
 url="https://github.com/linuxdeepin/deepin-anything"
@@ -12,14 +12,17 @@
 makedepends=('dtkcore' 'udisks2-qt5')
 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'
         deepin-anything-server.sysusers)
 sha512sums=('f79b4db917cce2611bd6964d00ae0e162fc500fa7ca76a987145456a9ee81296c776d2b83cf6492a4224c4e4fd95df3ad95a25c1c14d2d4e6865f5bbd639be14'
             '5ddbd2d968bc5b01dbc99648cec81ea072675d7fe7198835649d5b581997945d32bd842dd7ebf60185aa84722b94575ac7aeb5e4616945e22fae53272907305b'
+            '6200580088b6f49a9078119720ddbe4f9fe6faf5bc9d8a51d9a35d30271887f9cf75337f669b2c97cefa8c5d94aae20ddc44350a27a33d503af2ac1170f6a0c9'
             '0ff6a6de1fbfb0c33eaac511b989da321a9e43ece92708af88aee34ad1a05e55572713b1290bc2705d70b91dc7bec4fb4abd3dc664a0abe01de27d88bd9e9c85')
 
 prepare() {
   cd deepin-anything-$pkgver
   patch -Np1 < ../0001-linux-5.6.patch
+  patch -Np1 < ../0002-linux-5.10.patch
   sed -i 's|^systemd_service.path.*|systemd_service.path = /usr/lib/systemd/system|' server/monitor/src/src.pro server/tool/tool.pro
 }