LU-6215 llite: make_request_fn returns blk_qc_t in kernel 4.4

[fs/lustre-release.git] / autoMakefile.am

diff --git a/autoMakefile.am b/autoMakefile.am
index 689bee7..0943370 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -1,15 +1,15 @@
 SUBDIRS := @LDISKFS_SUBDIR@ \
        . \
-       @SNMP_SUBDIR@ \
        @LUSTREIOKIT_SUBDIR@ \
        @LIBCFS_SUBDIR@ \
+       @SNMP_SUBDIR@ \
        lnet \
        lustre
 
 DIST_SUBDIRS := ldiskfs \
-       @SNMP_DIST_SUBDIR@ \
        lustre-iokit \
        @LIBCFS_SUBDIR@ \
+       @SNMP_DIST_SUBDIR@ \
        lnet \
        lustre \
        config contrib
@@ -75,7 +75,7 @@ if LINUX
 all-am: modules
 
 modules: undef.h ldiskfs-sources lustre-sources
-       $(MAKE) CC="$(CC)" $(CROSS_VARS) -C $(LINUX_OBJ)             \
+       $(MAKE) CC="$(CC)" -C $(LINUX_OBJ) \
        -f $(PWD)/build/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) \
        LINUXINCLUDE='-I$$(srctree)/arch/$$(SRCARCH)/include -Iarch/$$(SRCARCH)/include/generated -Iinclude $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include) -I$$(srctree)/arch/$$(SRCARCH)/include/uapi -Iarch/$$(SRCARCH)/include/generated/uapi -I$$(srctree)/include/uapi -Iinclude/generated/uapi -include $(CONFIG_INCLUDE)' \
        $(MODULE_TARGET)=$(PWD) -o tmp_include_depends -o scripts -o \
@@ -93,16 +93,16 @@ dist-hook: undef.h
                        -name .svn -o \
                        -name .git -o \
                        -name .#* -exec rm -rf {} \;
-       $(MAKE) $(AM_MAKEFLAGS) \
-               top_distdir="$(top_distdir)" distdir="$(distdir)" \
-               module-dist-hook
 
 EXTRA_DIST = @PACKAGE_TARNAME@.spec    \
        build/Makefile                  \
        build/Rules.in                  \
-       build/gen_filelist.sh           \
        config.h.in                     \
-       undef.h
+       undef.h                         \
+       lustre-dkms_pre-build.sh        \
+       lustre-dkms_post-build.sh       \
+       LUSTRE-VERSION-GEN              \
+       LUSTRE-VERSION-FILE
 
 rpm-local:
        @(if test -z "$(RPMBUILD)"; then \
@@ -119,6 +119,39 @@ rpm-local:
        $(MKDIR_P) $(rpmbuilddir)/SPECS && \
        $(MKDIR_P) $(rpmbuilddir)/SOURCES)
 
+if SERVER
+DKMS_PACKAGE=$(PACKAGE)
+DKMS_SERVER=--with servers
+else
+DKMS_PACKAGE=$(PACKAGE)-client
+DKMS_SERVER=--without servers
+endif
+
+# Only zfs Lustre DKMS Server is supported, so previous configure command
+# must use related parameters for success.
+dkms-srpm: $(PACKAGE)-dkms.spec dist Makefile
+       rpmbuilddir=`mktemp -t -d rpmbuild-@PACKAGE@-$$USER-XXXXXXXX`; \
+       $(MAKE) $(AM_MAKEFLAGS) \
+               rpmbuilddir="$$rpmbuilddir" rpm-local || exit 1; \
+       $(RPMBUILD) \
+               --define "_tmppath $$rpmbuilddir/TMP" \
+               --define "_topdir $$rpmbuilddir" \
+               --define "_sourcedir $(top_srcdir)" \
+               $(DKMS_SERVER) \
+               --bs $(PACKAGE)-dkms.spec || exit 1; \
+       cp $$rpmbuilddir/SRPMS/*.src.rpm $(top_srcdir) || exit 1; \
+       rm -rf $$rpmbuilddir
+
+dkms-rpm: dkms-srpm
+       rpmbuilddir=`mktemp -t -d rpmbuild-@PACKAGE@-$$USER-XXXXXXXX`; \
+       $(RPMBUILD) \
+               --define "_tmppath $$rpmbuilddir/TMP" \
+               --define "_topdir $$rpmbuilddir" \
+               @RPMBUILD_BINARY_ARGS@ \
+               --rebuild $(DKMS_PACKAGE)-dkms-*.src.rpm || exit 1; \
+       cp $$rpmbuilddir/RPMS/*/*.rpm $(top_srcdir) || exit 1; \
+       rm -rf $$rpmbuilddir
+
 rpms: srpm
        rpmbuilddir=`mktemp -t -d rpmbuild-@PACKAGE@-$$USER-XXXXXXXX`; \
        $(MAKE) $(AM_MAKEFLAGS) \
@@ -218,16 +251,3 @@ checkstack-update:
 
 checkstack-clean:
        rm -f ${CSTK} ${CSTKO}
-
-module-dist-hook:
-       @if [ -d .git ]; then \
-               perl lustre/scripts/version_tag.pl \
-                       --make_META > $(distdir)/META; \
-       elif [ -f META ]; then \
-               cp META $(distdir)/META; \
-       else \
-               echo -e "\n" \
-               "*** I have no idea how to create a META file in $(distdir).\n"\
-               "*** Please file a bug at https://jira.hpdd.intel.com/\n"; \
-               exit 1; \
-       fi