Check ashift validity in 'zpool add'

[zfs] / module / Makefile.in

diff --git a/module/Makefile.in b/module/Makefile.in
index 50cbb58915821623f2550a9867fdea4244fd3faa..093cf2286cef0261c257a9cac01cdfa97165d4ed 100644 (file)
--- a/module/Makefile.in
+++ b/module/Makefile.in
@@ -4,6 +4,18 @@ subdir-m += unicode
 subdir-m += zcommon
 subdir-m += zfs
 subdir-m += zpios
+subdir-m += icp
+
+INSTALL_MOD_DIR ?= extra
+
+ZFS_MODULE_CFLAGS += -include @SPL_OBJ@/spl_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@
+@CONFIG_QAT_TRUE@ZFS_MODULE_CFLAGS += -I@QAT_SRC@/include
+@CONFIG_QAT_TRUE@KBUILD_EXTRA_SYMBOLS += @QAT_SYMBOLS@
+export ZFS_MODULE_CFLAGS
+
+SUBDIR_TARGETS = icp
 
 modules:
        @# Make the exported SPL symbols available to these modules.
@@ -11,9 +23,9 @@ modules:
        @# installed devel headers, or they may be in the module
        @# subdirectory when building against the spl source tree.
        @if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
-               /bin/cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \
+               cp @SPL_OBJ@/@SPL_SYMBOLS@ .; \
        elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
-               /bin/cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
+               cp @SPL_OBJ@/module/@SPL_SYMBOLS@ .; \
        else \
                echo -e "\n" \
                "*** Missing spl symbols ensure you have built the spl:\n" \
@@ -21,7 +33,10 @@ modules:
                "*** - @SPL_OBJ@/module/@SPL_SYMBOLS@\n"; \
                exit 1; \
        fi
-       $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ $@
+       list='$(SUBDIR_TARGETS)'; for targetdir in $$list; do \
+               $(MAKE) -C $$targetdir; \
+       done
+       $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ CONFIG_ZFS=m $@
 
 clean:
        @# Only cleanup the kernel build directories when CONFIG_KERNEL
@@ -34,24 +49,32 @@ clean:
 
 modules_install:
        @# Install the kernel modules
-       $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` \
-               INSTALL_MOD_PATH=$(DESTDIR) \
-               INSTALL_MOD_DIR=addon/zfs $@
+       $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` $@ \
+               INSTALL_MOD_PATH=$(DESTDIR)$(INSTALL_MOD_PATH) \
+               INSTALL_MOD_DIR=$(INSTALL_MOD_DIR) \
+               KERNELRELEASE=@LINUX_VERSION@
        @# Remove extraneous build products when packaging
+       kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
        if [ -n "$(DESTDIR)" ]; then \
-               find $(DESTDIR)/lib/modules/@LINUX_VERSION@ \
-                       -name 'modules.*' | xargs $(RM); \
+               find $$kmoddir -name 'modules.*' | xargs $(RM); \
        fi
-       sysmap=$(DESTDIR)/boot/System.map-@LINUX_VERSION@; \
+       sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \
        if [ -f $$sysmap ]; then \
                depmod -ae -F $$sysmap @LINUX_VERSION@; \
        fi
 
 modules_uninstall:
        @# 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:
+       list='$(subdir-m)'; for subdir in $$list; do \
+               (cd @top_srcdir@/module && find $$subdir -name '*.c' -o -name '*.h' -o -name '*.S' |\
+               xargs cp --parents -t $$distdir); \
+       done
 
 distclean maintainer-clean: clean
 install: modules_install