LU-3126 osd: remove fld lookup during configuration

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

diff --git a/autoMakefile.am b/autoMakefile.am
index 7dd4f1b..b607947 100644 (file)
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -1,4 +1,4 @@
-SUBDIRS := @LDISKFS_SUBDIR@ @SPL_SUBDIR@ @ZFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ @LUSTREIOKIT_SUBDIR@ @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@
@@ -84,7 +84,7 @@ all-am: modules
 modules: $(DEP) all-sources
        $(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) -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 \
        include/config/MARKER $@
 endif # LINUX
@@ -107,6 +107,10 @@ EXTRA_DIST = @PACKAGE_TARNAME@.spec                                        \
        build/Makefile                                                  \
        build/Rules.in
 
+if ARCH_MIC
+EXTRA_DIST += build/gen_filelist.sh
+endif
+
 rpms-real: @PACKAGE_TARNAME@.spec dist Makefile
        CONFIGURE_ARGS=$$(echo $$(eval echo $(ac_configure_args)) | \
                sed -re 's/--(en|dis)able-tests//'); \
@@ -120,27 +124,51 @@ rpms-real: @PACKAGE_TARNAME@.spec dist Makefile
                        RPMARGS="$$RPMARGS --define \"kobjdir @LINUX_OBJ@\""; \
                fi; \
        fi; \
+       if [ -n "@CROSS_PATH@" ]; then \
+               if [[ "X$(BUILD_SERVER)" = Xtrue ]]; then \
+                       echo -e "\n" \
+                       "*** Don't support cross compilation for the Intel(R) Xeon Phi(TM) card.\n"; \
+                       exit 1; \
+               fi; \
+               CROSS_SUFFIX="-mic"; \
+               RPMARGS="$$RPMARGS --define \"post_script build/gen_filelist.sh\""; \
+               RPMARGS="$$RPMARGS --define \"cross_path @CROSS_PATH@\""; \
+               RPMARGS="$$RPMARGS --define \"rootdir %{cross_path}\""; \
+               RPMARGS="$$RPMARGS --define \"_prefix %{cross_path}/usr\""; \
+               RPMARGS="$$RPMARGS --define \"_mandir %{_prefix}/share/man\""; \
+               RPMARGS="$$RPMARGS --define \"_sysconfdir %{cross_path}/etc\""; \
+               RPMARGS="$$RPMARGS --define \"make_args @CROSS_VARS@\""; \
+               if [ -s @LINUX@/../../.ver.build ]; then \
+                       MPSS_VERSION=$$(sed -ne 's/DRIVERS_\(.*\)-.*/\1/p' @LINUX@/../../.ver.build); \
+                       if [ -n "$$MPSS_VERSION" ]; then \
+                               RPMARGS="$$RPMARGS --define \"cross_requires intel-mic-gpl = 2.1.$$MPSS_VERSION\""; \
+                       fi; \
+               fi; \
+       fi; \
        CONFIGURE_ARGS=$$(echo $$(eval echo $$CONFIGURE_ARGS) | \
                sed -re 's/--with-release=[^ ][^ ]*//'); \
        RPMARGS="$$RPMARGS --define \"configure_args $$CONFIGURE_ARGS\""; \
        if [[ "X$(BUILD_TESTS)" = Xfalse ]]; then \
-               RPMARGS="$$RPMARGS --define \"build_lustre_tests 0\""; \
+               RPMARGS="$$RPMARGS --without lustre_tests"; \
        fi; \
        if [[ "X$(BUILD_SERVER)" = Xfalse ]]; then \
-               RPMARGS="$$RPMARGS --define \"lustre_name lustre-client\""; \
+               RPMARGS="$$RPMARGS --without servers"; \
+               if [ -n "@CROSS_PATH@" ]; then \
+                       RPMARGS="$$RPMARGS --define \"lustre_name lustre-client$$CROSS_SUFFIX\""; \
+               fi; \
        fi; \
        if [[ "X$(BUILD_OSD_LDISKFS)" = Xtrue ]]; then \
-               RPMARGS="$$RPMARGS --define \"build_lustre_osd_ldiskfs 1\""; \
+               RPMARGS="$$RPMARGS --with ldiskfs"; \
        fi; \
        if [[ "X$(BUILD_OSD_ZFS)" = Xtrue ]]; then \
-               RPMARGS="$$RPMARGS --define \"build_lustre_osd_zfs 1\""; \
+               RPMARGS="$$RPMARGS --with zfs"; \
        fi; \
        echo "Building Lustre RPM with $$RPMARGS"; \
        eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz
 
 srpm-real: @PACKAGE_TARNAME@.spec dist Makefile
        if [[ "X$(BUILD_TESTS)" = Xfalse ]]; then \
-               RPMARGS="--define \"build_lustre_tests 0\""; \
+               RPMARGS="--without lustre_tests"; \
        fi; \
        eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz