diff options
| author | Aqua-sama <aqua@iserlohn-fortress.net> | 2020-01-24 17:43:47 +0200 |
|---|---|---|
| committer | Aqua-sama <aqua@iserlohn-fortress.net> | 2020-01-24 17:43:47 +0200 |
| commit | c75ec7015d1eec36bc43943973a5c33a4dee4216 (patch) | |
| tree | a3e0f301053825dd005c3ebeceaecccc8e26296a | |
| parent | upgpkg: zfs-dkms 0.8.2-1 (diff) | |
| download | zfs-dkms-c75ec7015d1eec36bc43943973a5c33a4dee4216.tar.xz | |
Update to 0.8.3
| -rw-r--r-- | 0001-Linux-5.3-compat-Makefile-subdir-m-no-longer-support.patch | 65 | ||||
| -rw-r--r-- | PKGBUILD | 6 |
2 files changed, 3 insertions, 68 deletions
diff --git a/0001-Linux-5.3-compat-Makefile-subdir-m-no-longer-support.patch b/0001-Linux-5.3-compat-Makefile-subdir-m-no-longer-support.patch deleted file mode 100644 index 84ba2b5..0000000 --- a/0001-Linux-5.3-compat-Makefile-subdir-m-no-longer-support.patch +++ /dev/null @@ -1,65 +0,0 @@ -From ac0fbbfdf3d686130985615184bc25470dcd8c13 Mon Sep 17 00:00:00 2001 -From: Dominic Pearson <dsp@technoanimal.net> -Date: Tue, 20 Aug 2019 00:22:52 +0200 -Subject: [PATCH] Linux 5.3 compat: Makefile subdir-m no longer supported - -Uses obj-m instead, due to kernel changes. - -See LKML: Masahiro Yamada, Tue, 6 Aug 2019 19:03:23 +0900 - -Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> -Reviewed-by: Tony Hutter <hutter2@llnl.gov> -Signed-off-by: Dominic Pearson <dsp@technoanimal.net> -Closes #9169 -(cherry picked from commit 70f67bdbbf5f0e8e099f19db7550cb6e444cb0f8) -[Eli Schwartz: removed undesirable patch hunk for .gitignore, rebased -without 8f12a4f8d2846ca668f8ad90d9ea5c19c8c0b78f conflicts] ---- - module/Makefile.in | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/module/Makefile.in b/module/Makefile.in -index 935bd2663..168bc5a1b 100644 ---- a/module/Makefile.in -+++ b/module/Makefile.in -@@ -1,11 +1,11 @@ --subdir-m += avl --subdir-m += icp --subdir-m += lua --subdir-m += nvpair --subdir-m += spl --subdir-m += unicode --subdir-m += zcommon --subdir-m += zfs -+obj-m += avl/ -+obj-m += icp/ -+obj-m += lua/ -+obj-m += nvpair/ -+obj-m += spl/ -+obj-m += unicode/ -+obj-m += zcommon/ -+obj-m += zfs/ - - INSTALL_MOD_DIR ?= extra - -@@ -60,13 +60,13 @@ modules_install: - modules_uninstall: - @# Uninstall the kernel modules - kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@ -- list='$(subdir-m)'; for subdir in $$list; do \ -- $(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$subdir; \ -+ list='$(obj-m)'; for objdir in $$list; do \ -+ $(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$objdir; \ - done - - distdir: -- list='$(subdir-m)'; for subdir in $$list; do \ -- (cd @top_srcdir@/module && find $$subdir -name '*.c' -o -name '*.h' -o -name '*.S' |\ -+ list='$(obj-m)'; for objdir in $$list; do \ -+ (cd @top_srcdir@/module && find $$objdir -name '*.c' -o -name '*.h' -o -name '*.S' |\ - xargs cp --parents -t $$distdir); \ - done - --- -2.23.0 - @@ -2,7 +2,7 @@ # Contributor: Iacopo Isimbaldi <isiachi@rhye.it> pkgname=zfs-dkms -pkgver=0.8.2 +pkgver=0.8.3 pkgrel=1 pkgdesc="Kernel modules for the Zettabyte File System." arch=('any') @@ -13,10 +13,10 @@ provides=("${pkgname%-dkms}" 'spl-dkms') replaces=('spl-dkms') source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc} "0001-only-build-the-module-in-dkms.conf.patch") -sha256sums=('47608e257c8ecebb918014ef1da6172c3a45d990885891af18e80f5cc28beab8' +sha256sums=('545a4897ce30c2d2dd9010a0fdb600a0d3d45805e2387093c473efc03aa9d7fd' 'SKIP' '780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409') -b2sums=('5c15f6664ca70f0deeb5b9e32f2bcff68f9821529e5203ff18612ce88473fee9af369354c442f3db7882d301cf17c805c9635b05bfd3460833ed8e5ff8004dd0' +b2sums=('8b51b9d5b61543566bc7839d8452fdf9358442155e95f93a011531338824bbd4fc8879500e276b02d5d49d504a046728ecc0c6154f69eb7b47180b9bb0e46958' 'SKIP' '1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) <hutter2@llnl.gov> |