From c75ec7015d1eec36bc43943973a5c33a4dee4216 Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Fri, 24 Jan 2020 17:43:47 +0200 Subject: Update to 0.8.3 --- ...ompat-Makefile-subdir-m-no-longer-support.patch | 65 ---------------------- 1 file changed, 65 deletions(-) delete mode 100644 0001-Linux-5.3-compat-Makefile-subdir-m-no-longer-support.patch (limited to '0001-Linux-5.3-compat-Makefile-subdir-m-no-longer-support.patch') 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 -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 -Reviewed-by: Tony Hutter -Signed-off-by: Dominic Pearson -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 - -- cgit v1.2.1