Skip to content

Commit

Permalink
linux: module: uninstall legacy modules on (un)installation
Browse files Browse the repository at this point in the history
This can be reverted once we're sure nobody's using them anymore
(post-3.0 release?)

Reviewed-by: Tony Hutter <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13274
  • Loading branch information
nabijaczleweli authored and andrewc12 committed Sep 23, 2022
1 parent 8f52cb3 commit 7aef194
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions module/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,12 @@ clean-FreeBSD:

clean: clean-@ac_system@

.PHONY: modules_uninstall-Linux-legacy
modules_uninstall-Linux-legacy:
$(RM) -r $(addprefix $(KMODDIR)/$(INSTALL_MOD_DIR)/,spl/ avl/ icp/ lua/ nvpair/ unicode/ zcommon/ zfs/ zstd/)

KMODDIR := $(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@
modules_install-Linux:
modules_install-Linux: modules_uninstall-Linux-legacy
@# Install the kernel modules
$(MAKE) -C @LINUX_OBJ@ M="$$PWD" modules_install \
INSTALL_MOD_PATH=$(INSTALL_MOD_PATH) \
Expand Down Expand Up @@ -106,7 +110,7 @@ modules_install-FreeBSD:

modules_install: modules_install-@ac_system@

modules_uninstall-Linux:
modules_uninstall-Linux: modules_uninstall-Linux-legacy
@# Uninstall the kernel modules
$(RM) $(addprefix $(KMODDIR)/$(INSTALL_MOD_DIR)/,zfs.ko spl.ko)

Expand Down

0 comments on commit 7aef194

Please sign in to comment.