summarylogtreecommitdiffstats
path: root/linux-5.3-compat-Makefile-subdir-m-no-longer-supported.patch
diff options
context:
space:
mode:
Diffstat (limited to 'linux-5.3-compat-Makefile-subdir-m-no-longer-supported.patch')
-rw-r--r--linux-5.3-compat-Makefile-subdir-m-no-longer-supported.patch41
1 files changed, 41 insertions, 0 deletions
diff --git a/linux-5.3-compat-Makefile-subdir-m-no-longer-supported.patch b/linux-5.3-compat-Makefile-subdir-m-no-longer-supported.patch
new file mode 100644
index 00000000000..4569fb80e84
--- /dev/null
+++ b/linux-5.3-compat-Makefile-subdir-m-no-longer-supported.patch
@@ -0,0 +1,41 @@
+diff --unified --recursive --text a/module/Makefile.in b/module/Makefile.in
+--- a/module/Makefile.in 2019-06-12 20:09:52.908943339 -0400
++++ b/module/Makefile.in 2019-09-21 12:50:08.568119182 -0400
+@@ -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_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
+