X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autoMakefile.am;h=ae9f30aed5dbb0eae92ec0c4fd13bd1d734da237;hp=efd73e7346be572c434c040703194818211db7a9;hb=ae295503f53e867e11dc51b217f336e8b20d119f;hpb=340f512efb21e2a63cd32a824f170854eed8cf56

diff --git a/autoMakefile.am b/autoMakefile.am
index efd73e7..ae9f30a 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -11,6 +11,8 @@ DIST_SUBDIRS := ldiskfs @SNMP_DIST_SUBDIR@ libsysio lustre-iokit @LIBCFS_SUBDIR@
 @LDISKFS_ENABLED_FALSE@BUILD_OSD_LDISKFS = false
 @ZFS_ENABLED_TRUE@BUILD_OSD_ZFS = true
 @ZFS_ENABLED_FALSE@BUILD_OSD_ZFS = false
+@BUILD_LUSTREIOKIT_TRUE@BUILD_LUSTREIOKIT = true
+@BUILD_LUSTREIOKIT_FALSE@BUILD_LUSTREIOKIT = false
 
 AUTOMAKE_OPTIONS = foreign
 
@@ -70,7 +72,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) -I$$(srctree)/arch/$$(SRCARCH)/include/uapi -Iarch/$$(SRCARCH)/include/generated/uapi -I$$(srctree)/include/uapi -Iinclude/generated/uapi -include $(CONFIG_INCLUDE)' \
+	LINUXINCLUDE='-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
@@ -78,7 +80,6 @@ endif # LINUX
 endif # MODULES
 
 dist-hook:
-	$(RM) $(distdir)/lustre-iokit/*.spec
 	find $(distdir) -name .deps -o \
 			-name CVS -o \
 			-name .svn -o \
@@ -88,19 +89,17 @@ dist-hook:
 	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
 	  module-dist-hook
 
-EXTRA_DIST = @PACKAGE_TARNAME@.spec					\
-	build/Makefile 							\
-	build/Rules.in
+EXTRA_DIST = @PACKAGE_TARNAME@.spec	\
+	build/Makefile 			\
+	build/Rules.in			\
+	build/gen_filelist.sh
 
-if ARCH_MIC
-EXTRA_DIST += build/gen_filelist.sh
-endif
-
-rpms-real: @PACKAGE_TARNAME@.spec dist Makefile
+rpms: @PACKAGE_TARNAME@.spec dist Makefile
 	@CONFIGURE_ARGS=""; \
 	for arg in $(ac_configure_args); do \
 		case $$arg in \
 			--with-release=* ) ;; \
+			--with-kmp-moddir=* ) ;; \
 			--enable-tests | --disable-tests ) ;; \
 			--with-linux=* | --with-linux-obj=* ) ;; \
 			* ) CONFIGURE_ARGS="$$CONFIGURE_ARGS '$$arg'" ;; \
@@ -113,6 +112,9 @@ rpms-real: @PACKAGE_TARNAME@.spec dist Makefile
 			RPMARGS="$$RPMARGS --define \"kobjdir @LINUX_OBJ@\""; \
 		fi; \
 	fi; \
+	if [ -n "@KMP_MODDIR@" ]; then \
+		RPMARGS="$$RPMARGS --define \"kmoddir @KMP_MODDIR@\""; \
+	fi; \
 	if [ -n "@CROSS_PATH@" ]; then \
 		if [[ "X$(BUILD_SERVER)" = Xtrue ]]; then \
 			echo -e "\n" \
@@ -127,11 +129,10 @@ rpms-real: @PACKAGE_TARNAME@.spec dist Makefile
 		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; \
+		if [ "@CC_TARGET_ARCH@" = "k1om-mpss-linux" ]; then \
+			RPMARGS="$$RPMARGS --define \"cross_requires mpss-bootimage\""; \
+		else \
+			RPMARGS="$$RPMARGS --define \"cross_requires intel-mic-gpl\""; \
 		fi; \
 	fi; \
 	if [[ "X$(BUILD_TESTS)" = Xfalse ]]; then \
@@ -149,27 +150,21 @@ rpms-real: @PACKAGE_TARNAME@.spec dist Makefile
 	if [[ "X$(BUILD_OSD_ZFS)" = Xtrue ]]; then \
 		RPMARGS="$$RPMARGS --with zfs"; \
 	fi; \
+        if [[ "X$(BUILD_LUSTREIOKIT)" = Xfalse ]]; then \
+                RPMARGS="$$RPMARGS --without lustre_iokit"; \
+        fi; \
 	echo "Building Lustre RPM with $$RPMARGS"; \
 	eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz
 
-srpm-real: @PACKAGE_TARNAME@.spec dist Makefile
+srpm: @PACKAGE_TARNAME@.spec dist Makefile
 	if [[ "X$(BUILD_TESTS)" = Xfalse ]]; then \
 		RPMARGS="--without lustre_tests"; \
 	fi; \
+        if [[ "X$(BUILD_LUSTREIOKIT)" = Xfalse ]]; then \
+                RPMARGS="$$RPMARGS --without lustre_iokit"; \
+        fi; \
 	eval rpmbuild $$RPMARGS -ts $(distdir).tar.gz
 
-rpms:
-if BUILD_LUSTREIOKIT
-	$(MAKE) -C @LUSTREIOKIT_SUBDIR@ $(AM_MAKEFLAGS) $@
-endif
-	$(MAKE) $(AM_MAKEFLAGS) rpms-real
-
-srpm:
-if BUILD_LUSTREIOKIT
-	$(MAKE) -C @LUSTREIOKIT_SUBDIR@ $(AM_MAKEFLAGS) $@
-endif
-	$(MAKE) $(AM_MAKEFLAGS) srpm-real
-
 # In the debs target, first make sure what's in the changelog reflects
 # the software version.  Here's how we could dig the version out of the
 # autoconf version file directly:
@@ -261,8 +256,8 @@ checkstack-clean:
 	rm -f ${CSTK} ${CSTKO}
 
 module-dist-hook:
-	if [ -d CVS -o -d .git ]; then \
-		perl lustre/scripts/make_META.pl > $(distdir)/META; \
+	if [ -d .git ]; then \
+		perl lustre/scripts/version_tag.pl --make_META > $(distdir)/META; \
 	elif [ -f META ]; then \
 		cp META $(distdir)/META; \
 	else \