Date: Sunday, April 5, 2020 @ 03:17:20 Author: heftig Revision: 611786
archrelease: copy trunk to community-staging-x86_64 Added: deepin-anything-arch/repos/community-staging-x86_64/0001-linux-5.6.patch (from rev 611785, deepin-anything-arch/trunk/0001-linux-5.6.patch) deepin-anything-arch/repos/community-staging-x86_64/PKGBUILD (from rev 611785, deepin-anything-arch/trunk/PKGBUILD) Deleted: deepin-anything-arch/repos/community-staging-x86_64/0001-linux-5.6.patch deepin-anything-arch/repos/community-staging-x86_64/PKGBUILD ----------------------+ 0001-linux-5.6.patch | 80 ++++++++++++++++++++++++------------------------- PKGBUILD | 70 +++++++++++++++++++++--------------------- 2 files changed, 75 insertions(+), 75 deletions(-) Deleted: 0001-linux-5.6.patch =================================================================== --- 0001-linux-5.6.patch 2020-04-05 03:16:50 UTC (rev 611785) +++ 0001-linux-5.6.patch 2020-04-05 03:17:20 UTC (rev 611786) @@ -1,40 +0,0 @@ -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-staging-x86_64/0001-linux-5.6.patch (from rev 611785, deepin-anything-arch/trunk/0001-linux-5.6.patch) =================================================================== --- 0001-linux-5.6.patch (rev 0) +++ 0001-linux-5.6.patch 2020-04-05 03:17:20 UTC (rev 611786) @@ -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) + { Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-04-05 03:16:50 UTC (rev 611785) +++ PKGBUILD 2020-04-05 03:17:20 UTC (rev 611786) @@ -1,35 +0,0 @@ -# Maintainer: Felix Yan <felixonm...@archlinux.org> - -pkgname=deepin-anything-arch -pkgver=5.0.1 -pkgrel=64 -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') -sha512sums=('f79b4db917cce2611bd6964d00ae0e162fc500fa7ca76a987145456a9ee81296c776d2b83cf6492a4224c4e4fd95df3ad95a25c1c14d2d4e6865f5bbd639be14' - '5ddbd2d968bc5b01dbc99648cec81ea072675d7fe7198835649d5b581997945d32bd842dd7ebf60185aa84722b94575ac7aeb5e4616945e22fae53272907305b') - -prepare() { - cd deepin-anything-$pkgver - patch -Np1 < ../0001-linux-5.6.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 xz {} + -} Copied: deepin-anything-arch/repos/community-staging-x86_64/PKGBUILD (from rev 611785, deepin-anything-arch/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-04-05 03:17:20 UTC (rev 611786) @@ -0,0 +1,35 @@ +# Maintainer: Felix Yan <felixonm...@archlinux.org> + +pkgname=deepin-anything-arch +pkgver=5.0.1 +pkgrel=65 +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') +sha512sums=('f79b4db917cce2611bd6964d00ae0e162fc500fa7ca76a987145456a9ee81296c776d2b83cf6492a4224c4e4fd95df3ad95a25c1c14d2d4e6865f5bbd639be14' + '5ddbd2d968bc5b01dbc99648cec81ea072675d7fe7198835649d5b581997945d32bd842dd7ebf60185aa84722b94575ac7aeb5e4616945e22fae53272907305b') + +prepare() { + cd deepin-anything-$pkgver + patch -Np1 < ../0001-linux-5.6.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 xz {} + +}