Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Add KMODDIR to install target 

Provide a mechanism to control the directory name the modules
are installed in.  The kernel privdes INSTALL_MOD_DIR for
this but it was hardcoded to be 'addon/zfs'.

Add a KMODDIR variable which can be passed to 'make install'
to override the default directory name.  While we're here
change the default from 'addon/zfs' to 'extra' which is the
kernel.org default.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
This commit is contained in:
Brian Behlendorf 2013-02-17 11:05:11 -08:00
parent fd2b4aa71a
commit d09f98a9a6
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
module/Makefile.in
View File

@ -5,6 +5,8 @@ subdir-m += zcommon
subdir-m += zfs subdir-m += zfs
subdir-m += zpios subdir-m += zpios
INSTALL_MOD_DIR ?= extra
ZFS_MODULE_CFLAGS += -include @SPL_OBJ@/spl_config.h ZFS_MODULE_CFLAGS += -include @SPL_OBJ@/spl_config.h
ZFS_MODULE_CFLAGS += -include @abs_top_builddir@/zfs_config.h ZFS_MODULE_CFLAGS += -include @abs_top_builddir@/zfs_config.h
ZFS_MODULE_CFLAGS += -I@abs_top_srcdir@/include -I@SPL@/include -I@SPL@ ZFS_MODULE_CFLAGS += -I@abs_top_srcdir@/include -I@SPL@/include -I@SPL@
@ -39,22 +41,25 @@ clean:
modules_install: modules_install:
@# Install the kernel modules @# Install the kernel modules
$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \ $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \
INSTALL_MOD_PATH=$(DESTDIR) \ INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \
INSTALL_MOD_DIR=addon/zfs $@ INSTALL_MOD_DIR=$(INSTALL_MOD_DIR)
@# Remove extraneous build products when packaging @# Remove extraneous build products when packaging
if [ -n "$(DESTDIR)" ]; then \ kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
find $(DESTDIR)/lib/modules/@LINUX_VERSION@ \ if [ -n $$kmoddir ]; then \
-name 'modules.*' | xargs $(RM); \ find $$kmoddir -name 'modules.*' | xargs $(RM); \
fi fi
sysmap=$(DESTDIR)/boot/System.map-@LINUX_VERSION@; \ sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
if [ -f $$sysmap ]; then \ if [ -f $$sysmap ]; then \
depmod -ae -F $$sysmap @LINUX_VERSION@; \ depmod -ae -F $$sysmap @LINUX_VERSION@; \
fi fi
modules_uninstall: modules_uninstall:
@# Uninstall the kernel modules @# Uninstall the kernel modules
$(RM) -R $(DESTDIR)/lib/modules/@LINUX_VERSION@/addon/zfs kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@
list='$(subdir-m)'; for subdir in $$list; do \
$(RM) -R $$kmoddir/$(INSTALL_MOD_DIR)/$$subdir; \
done
distdir: distdir: