X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autoMakefile.am;h=9b6dcfd0fd5d42fbc730f41c072cd1bcd53b892e;hp=79bcd658023691db1f51dafbe1ae2af0fd9a29e1;hb=ea766bd959cc2347b223d597b3f8a31e010bed72;hpb=25c93758d6b1136d268fe3fcc1c4979c17463c0b

diff --git a/autoMakefile.am b/autoMakefile.am
index 79bcd65..9b6dcfd 100644
--- 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@
@@ -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
@@ -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,6 +124,27 @@ 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\""; \
@@ -127,7 +152,7 @@ rpms-real: @PACKAGE_TARNAME@.spec dist Makefile
 		RPMARGS="$$RPMARGS --define \"build_lustre_tests 0\""; \
 	fi; \
 	if [[ "X$(BUILD_SERVER)" = Xfalse ]]; then \
-		RPMARGS="$$RPMARGS --define \"lustre_name lustre-client\""; \
+		RPMARGS="$$RPMARGS --define \"lustre_name lustre-client$$CROSS_SUFFIX\""; \
 	fi; \
 	if [[ "X$(BUILD_OSD_LDISKFS)" = Xtrue ]]; then \
 		RPMARGS="$$RPMARGS --define \"build_lustre_osd_ldiskfs 1\""; \