refactor

Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>

4 files changed, 55 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d04ff23dac5c..1742f73d5094 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,27 @@
 pkgbase = zfs-dkms-git
 	pkgdesc = Kernel modules for the Zettabyte File System.
-	pkgver = 2.0.0rc1.r38.gcd80273909
+	pkgver = 2.1.99.r1271.g1c0c729ab4
 	pkgrel = 1
 	epoch = 2
 	url = https://zfsonlinux.org/
-	arch = any
+	arch = x86_64
+	groups = zfs-git
 	license = CDDL
 	makedepends = git
-	provides = ZFS-MODULE=2.0.0rc1.r38.gcd80273909
-	provides = SPL-MODULE=2.0.0rc1.r38.gcd80273909
-	provides = zfs-dkms=2.0.0rc1.r38.gcd80273909
+	depends = zfs-utils-git=2:2.1.99.r1271.g1c0c729ab4
+	depends = dkms
+	provides = ZFS-MODULE=2.1.99.r1271.g1c0c729ab4
+	provides = SPL-MODULE=2.1.99.r1271.g1c0c729ab4
+	provides = zfs-dkms=2.1.99.r1271.g1c0c729ab4
 	provides = spl-dkms
-	provides = zfs
 	conflicts = zfs-dkms
 	conflicts = spl-dkms
 	replaces = spl-dkms-git
 	source = git+https://github.com/zfsonlinux/zfs.git
 	source = 0001-only-build-the-module-in-dkms.conf.patch
 	sha256sums = SKIP
-	sha256sums = 780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409
+	sha256sums = 539f325e56443554f9b87baff33948b91a280ec1daadcb0c636b105252fcd0f5
 	b2sums = SKIP
-	b2sums = 1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50
+	b2sums = a8ab5da81d214e7801f0f8cdf77c076c714a3f17292df15ca35fcf7aef2c4d505348797e3b1da7590ea303ff488490ddba49e6f9e3f8a0bcc975894d51d97c2b
 
 pkgname = zfs-dkms-git
-	depends = zfs-utils-git=2:2.0.0rc1.r38.gcd80273909
-	depends = dkms
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..c3e43b1da9f3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+zfs
+src
+pkg
+*.pkg.*
+*.log
diff --git a/0001-only-build-the-module-in-dkms.conf.patch b/0001-only-build-the-module-in-dkms.conf.patch
index 0e162b5db1fa..2efd98c69bd0 100644
--- a/0001-only-build-the-module-in-dkms.conf.patch
+++ b/0001-only-build-the-module-in-dkms.conf.patch
@@ -1,49 +1,43 @@
-From b4a2c0b184c9c9599421b15a430fb88deb5dbd17 Mon Sep 17 00:00:00 2001
-From: Eli Schwartz <eschwartz@archlinux.org>
-Date: Sun, 28 Oct 2018 15:01:58 -0400
+From 00ff63ea9cdf92539b36bde81b7df3e70eb05480 Mon Sep 17 00:00:00 2001
+From: Yurii Kolesnykov <root@yurikoles.com>
+Date: Fri, 27 May 2022 04:04:02 +0300
 Subject: [PATCH] only build the module in dkms.conf
 
+Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>
+Co-authored-by: Eli Schwartz <eschwartz@archlinux.org>
 ---
- scripts/dkms.mkconf | 19 ++-----------------
- 1 file changed, 2 insertions(+), 17 deletions(-)
+ scripts/dkms.mkconf | 11 ++---------
+ 1 file changed, 2 insertions(+), 9 deletions(-)
 
 diff --git a/scripts/dkms.mkconf b/scripts/dkms.mkconf
-index 88c289383..5a859a0e0 100755
+index 0bd3834204..e33f637260 100755
 --- a/scripts/dkms.mkconf
 +++ b/scripts/dkms.mkconf
-@@ -25,22 +25,7 @@ PACKAGE_CONFIG="${pkgcfg}"
+@@ -28,14 +28,7 @@ NO_WEAK_MODULES="yes"
  PRE_BUILD="configure
    --prefix=/usr
    --with-config=kernel
 -  --with-linux=\$(
--    case \`lsb_release -is\` in
--      (Debian|Devuan)
--        if [[ -e \${kernel_source_dir/%build/source} ]]
--        then
--          echo \${kernel_source_dir/%build/source}
--        else
--          # A kpkg exception for Proxmox 2.0
--          echo \${kernel_source_dir}
--        fi
--      ;;
--      (*)
--        echo \${kernel_source_dir}
--      ;;
--    esac
+-    if [ -e "\${kernel_source_dir/%build/source}" ]
+-    then
+-      echo "\${kernel_source_dir/%build/source}"
+-    else
+-      echo "\${kernel_source_dir}"
+-    fi
 -  )
 +  --with-linux=\${kernel_source_dir}
-   --with-linux-obj=\${kernel_source_dir}
-   --with-spl=\${source_tree}/spl-\${PACKAGE_VERSION}
-   --with-spl-obj=\${dkms_tree}/spl/\${PACKAGE_VERSION}/\${kernelver}/\${arch}
-@@ -78,7 +63,7 @@ POST_BUILD="scripts/dkms.postbuild
- BUILD_DEPENDS[0]="spl"
+   --with-linux-obj="\${kernel_source_dir}"
+   \$(
+     [[ -n \"\${ICP_ROOT}\" ]] && \\
+@@ -68,7 +61,7 @@ POST_BUILD="scripts/dkms.postbuild
+   -t \${dkms_tree}
+ "
  AUTOINSTALL="yes"
- REMAKE_INITRD="no"
 -MAKE[0]="make"
 +MAKE[0]="make -C module/"
  STRIP[0]="\$(
    [[ -r \${PACKAGE_CONFIG} ]] \\
    && source \${PACKAGE_CONFIG} \\
 -- 
-2.19.1
+2.36.1
 
diff --git a/PKGBUILD b/PKGBUILD
index 36b2bd7aa410..22dc8bc0f106 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,38 @@
-# Maintainer: Eli Schwartz <eschwartz@archlinux.org>
+# Maintainer: Yurii Kolesnykov <root@yurikoles.com>
+# Contributor: Eli Schwartz <eschwartz@archlinux.org>
 # Contributor: Iacopo Isimbaldi <isiachi@rhye.it>
 
-# All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds
+# PRs are welcome: https://github.com/yurikoles-aur/zfs-dkms-git
 
 pkgname=zfs-dkms-git
-pkgver=2.0.0rc1.r38.gcd80273909
+pkgver=2.1.99.r1271.g1c0c729ab4
 pkgrel=1
 epoch=2
-pkgdesc="Kernel modules for the Zettabyte File System."
-arch=('any')
-url="https://zfsonlinux.org/"
+pkgdesc='Kernel modules for the Zettabyte File System.'
+arch=('x86_64')
+url='https://zfsonlinux.org/'
 license=('CDDL')
+groups=('zfs-git')
+depends=("zfs-utils-git=${epoch}:${pkgver}" 'dkms')
 makedepends=('git')
-conflicts=("${pkgname%-git}" 'spl-dkms')
 provides=("ZFS-MODULE=${pkgver}" "SPL-MODULE=${pkgver}" "${pkgname%-git}=${pkgver}" 'spl-dkms')
-# ambiguous, provided for backwards compat, pls don't use
-provides+=('zfs')
+conflicts=("${pkgname%-git}" 'spl-dkms')
 replaces=('spl-dkms-git')
 source=("git+https://github.com/zfsonlinux/zfs.git"
         "0001-only-build-the-module-in-dkms.conf.patch")
 sha256sums=('SKIP'
-            '780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409')
+            '539f325e56443554f9b87baff33948b91a280ec1daadcb0c636b105252fcd0f5')
 b2sums=('SKIP'
-        '1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50')
+        'a8ab5da81d214e7801f0f8cdf77c076c714a3f17292df15ca35fcf7aef2c4d505348797e3b1da7590ea303ff488490ddba49e6f9e3f8a0bcc975894d51d97c2b')
 
 pkgver() {
-    cd "${srcdir}"/zfs
+    cd zfs
 
     git describe --long | sed 's/^zfs-//;s/-rc/rc/;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-    cd "${srcdir}"/zfs
+    cd zfs
 
     patch -p1 -i ../0001-only-build-the-module-in-dkms.conf.patch
 
@@ -46,7 +47,7 @@ prepare() {
 }
 
 build() {
-    cd "${srcdir}"/zfs
+    cd zfs
 
     ./scripts/dkms.mkconf -n zfs -v ${pkgver} -f dkms.conf
     # update metadata
@@ -56,13 +57,8 @@ build() {
 }
 
 package() {
-    depends=("zfs-utils-git=${epoch}:${pkgver}" 'dkms')
-
-    cd "${srcdir}"/zfs
-
     dkmsdir="${pkgdir}/usr/src/zfs-${pkgver}"
-    install -d "${dkmsdir}"/{config,scripts}
-    cp -a configure dkms.conf Makefile.in META zfs_config.h.in zfs.release.in include/ module/ "${dkmsdir}"/
-    cp config/compile config/config.* config/missing config/*sh "${dkmsdir}"/config/
-    cp scripts/enum-extract.pl scripts/dkms.postbuild "${dkmsdir}"/scripts/
+    install -d "${dkmsdir}"
+    cp -a zfs/. "${dkmsdir}"
+    rm -rf "${dkmsdir}"/.git*
 }