LU-2469 test: Skip failing ZFS tests

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

diff --git a/autoMakefile.am b/autoMakefile.am
index 77d9889..883d13c 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -10,6 +10,10 @@ MODULE_SYMVERS_DEPS = module-symvers
 @SERVER_FALSE@BUILD_SERVER = false
 @CLIENT_TRUE@BUILD_CLIENT = true
 @CLIENT_FALSE@BUILD_CLIENT = false
+@LDISKFS_ENABLED_TRUE@BUILD_OSD_LDISKFS = true
+@LDISKFS_ENABLED_FALSE@BUILD_OSD_LDISKFS = false
+@ZFS_ENABLED_TRUE@BUILD_OSD_ZFS = true
+@ZFS_ENABLED_FALSE@BUILD_OSD_ZFS = false
 
 AUTOMAKE_OPTIONS = foreign
 
@@ -78,7 +82,7 @@ if LINUX
 all-am: modules
 
 modules: $(DEP) all-sources
-       $(MAKE) $(ARCH_UM) CC="$(CC)" -C $(LINUX_OBJ)                \
+       $(MAKE) CC="$(CC)" -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)' \
        $(MODULE_TARGET)=$(PWD) -o tmp_include_depends -o scripts -o \
@@ -132,6 +136,12 @@ 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\""; \
+       fi; \
+       if [[ "X$(BUILD_OSD_ZFS)" = Xfalse ]]; then \
+               RPMARGS="$$RPMARGS --define \"build_lustre_osd_zfs 0\""; \
+       fi; \
        echo "Building Lustre RPM with $$RPMARGS"; \
        eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz