Revert "LU-3264 tests: support failover testing with ZFS"

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

diff --git a/autoMakefile.am b/autoMakefile.am
index 883d13c..1cc3b48 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -1,5 +1,5 @@
-SUBDIRS := @LDISKFS_SUBDIR@ @SPL_SUBDIR@ @ZFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
-DIST_SUBDIRS := @LDISKFS_DIST_SUBDIR@ @SNMP_DIST_SUBDIR@ libsysio lustre-iokit @LIBCFS_SUBDIR@ lnet lustre
+SUBDIRS := @LDISKFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
+DIST_SUBDIRS := @LDISKFS_DIST_SUBDIR@ @SNMP_DIST_SUBDIR@ libsysio lustre-iokit @LIBCFS_SUBDIR@ lnet lustre config contrib
 SOURCES_SUBDIRS := @LIBCFS_SUBDIR@ lnet lustre
 RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@
 MODULE_SYMVERS_DEPS = module-symvers
@@ -82,9 +82,9 @@ if LINUX
 all-am: modules
 
 modules: $(DEP) all-sources
-       $(MAKE) CC="$(CC)" -C $(LINUX_OBJ)                           \
+       $(MAKE) CC="$(CC)" $(CROSS_VARS) -C $(LINUX_OBJ)             \
        -f $(PWD)/build/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) \
-        LINUXINCLUDE='$(EXTRA_LNET_INCLUDE) -I$$(srctree)/arch/$$(SRCARCH)/include -I$$(srctree)/arch/$$(SRCARCH)/include/generated -Iinclude $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include) -include $(CONFIG_INCLUDE)' \
+       LINUXINCLUDE='$(EXTRA_LNET_INCLUDE) -I$$(srctree)/arch/$$(SRCARCH)/include -I$$(srctree)/arch/$$(SRCARCH)/include/generated -Iinclude $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include) -include $(CONFIG_INCLUDE)' \
        $(MODULE_TARGET)=$(PWD) -o tmp_include_depends -o scripts -o \
        include/config/MARKER $@
 endif # LINUX
@@ -104,15 +104,8 @@ dist-hook:
          module-dist-hook
 
 EXTRA_DIST = @PACKAGE_TARNAME@.spec                                    \
-       build/Makefile build/lbuild*                                    \
-       build/Rules.in                                                  \
-       build/update_oldconfig                                          \
-       build/autoconf/lustre-build-linux.m4                            \
-       build/autoconf/lustre-build-darwin.m4                           \
-       build/autoconf/lustre-build-ldiskfs.m4                          \
-       build/autoconf/lustre-build.m4 build/rdac_spec                  \
-       build/mptlinux.spec.patch build/patches                         \
-       build/funcs.sh build/find_linux_rpms build/exit_traps.sh
+       build/Makefile                                                  \
+       build/Rules.in
 
 rpms-real: @PACKAGE_TARNAME@.spec dist Makefile
        CONFIGURE_ARGS=$$(echo $$(eval echo $(ac_configure_args)) | \
@@ -136,11 +129,11 @@ rpms-real: @PACKAGE_TARNAME@.spec dist Makefile
        if [[ "X$(BUILD_SERVER)" = Xfalse ]]; then \
                RPMARGS="$$RPMARGS --define \"lustre_name lustre-client\""; \
        fi; \
-       if [[ "X$(BUILD_OSD_LDISKFS)" = Xfalse ]]; then \
-               RPMARGS="$$RPMARGS --define \"build_lustre_osd_ldiskfs 0\""; \
+       if [[ "X$(BUILD_OSD_LDISKFS)" = Xtrue ]]; then \
+               RPMARGS="$$RPMARGS --define \"build_lustre_osd_ldiskfs 1\""; \
        fi; \
-       if [[ "X$(BUILD_OSD_ZFS)" = Xfalse ]]; then \
-               RPMARGS="$$RPMARGS --define \"build_lustre_osd_zfs 0\""; \
+       if [[ "X$(BUILD_OSD_ZFS)" = Xtrue ]]; then \
+               RPMARGS="$$RPMARGS --define \"build_lustre_osd_zfs 1\""; \
        fi; \
        echo "Building Lustre RPM with $$RPMARGS"; \
        eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz
@@ -253,7 +246,7 @@ CSTKO=/tmp/checkstack.orig
 checkstack:
        [ -f ${CSTK} -a ! -s ${CSTKO} ] && mv -f ${CSTK} ${CSTKO} || true
        { for MOD in $$(find . -name "*.ko"); do                             \
-               objdump -d $$MOD | perl build/checkstack.pl;                 \
+               objdump -d $$MOD | perl contrib/scripts/checkstack.pl;       \
          done } | grep -v " bug " | sort -nr | uniq > ${CSTK}
        [ -f ${CSTKO} ] && ! diff -u ${CSTKO} ${CSTK} || head -30 ${CSTK}