diff options
| author | Dominic Pearson <[email protected]> | 2019-08-20 00:22:52 +0200 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2019-08-19 15:22:52 -0700 |
| commit | ff4b68eedc307e6e9b7f3890b809cbb0e9d73856 (patch) | |
| tree | a6c048638f23422f0ee8f863950ca599baf453c3 | |
| parent | f6fbe25664629d1ae6a3b186f14ec69dbe6c6232 (diff) | |
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 <[email protected]>
Reviewed-by: Tony Hutter <[email protected]>
Signed-off-by: Dominic Pearson <[email protected]>
Closes #9169
| -rw-r--r-- | .gitignore | 11 | ||||
| -rw-r--r-- | module/Makefile.in | 24 |
2 files changed, 23 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore index 549fa59f3..ae9e22dfa 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,14 @@ cscope.* *.log venv +# +# Module leftovers +# +/module/avl/zavl.mod +/module/icp/icp.mod +/module/lua/zlua.mod +/module/nvpair/znvpair.mod +/module/spl/spl.mod +/module/unicode/zunicode.mod +/module/zcommon/zcommon.mod +/module/zfs/zfs.mod diff --git a/module/Makefile.in b/module/Makefile.in index eca7691ae..7477dbe56 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 \ + 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 @abs_top_builddir@/module/$$distdir); \ done |