X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autoMakefile.am;h=1a61ae72dcaa1e3405b668ad8eccb1c5b3c4ecbc;hp=ae9f30aed5dbb0eae92ec0c4fd13bd1d734da237;hb=a4bcfa9c49abae8035b05d94a09352aae01bd77d;hpb=83b8634e60a26012d1cfedaea42595a7af02e570

diff --git a/autoMakefile.am b/autoMakefile.am
index ae9f30a..1a61ae7 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -1,18 +1,18 @@
-SUBDIRS := @LDISKFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
-DIST_SUBDIRS := ldiskfs @SNMP_DIST_SUBDIR@ libsysio lustre-iokit @LIBCFS_SUBDIR@ lnet lustre config contrib
-
-@TESTS_TRUE@BUILD_TESTS = true
-@TESTS_FALSE@BUILD_TESTS = false
-@SERVER_TRUE@BUILD_SERVER = true
-@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
-@BUILD_LUSTREIOKIT_TRUE@BUILD_LUSTREIOKIT = true
-@BUILD_LUSTREIOKIT_FALSE@BUILD_LUSTREIOKIT = false
+SUBDIRS := @LDISKFS_SUBDIR@ \
+	. \
+	@SNMP_SUBDIR@ \
+	@LUSTREIOKIT_SUBDIR@ \
+	@LIBCFS_SUBDIR@ \
+	lnet \
+	lustre
+
+DIST_SUBDIRS := ldiskfs \
+	@SNMP_DIST_SUBDIR@ \
+	lustre-iokit \
+	@LIBCFS_SUBDIR@ \
+	lnet \
+	lustre \
+	config contrib
 
 AUTOMAKE_OPTIONS = foreign
 
@@ -61,18 +61,23 @@ doxygen-%: build/doxyfile.%
 	doxygen $<
 
 if MODULES
-sources: all-sources
+.PHONY: ldiskfs-sources lustre-sources
 
-all-sources: module-symvers
+ldiskfs-sources:
+if LDISKFS_ENABLED
+	$(MAKE) sources -C @LDISKFS_SUBDIR@ || exit $$?
+endif
+
+lustre-sources:
 	$(MAKE) sources -C lustre || exit $$?
 
 if LINUX
 all-am: modules
 
-modules: $(DEP) all-sources
+modules: ldiskfs-sources lustre-sources module-symvers
 	$(MAKE) CC="$(CC)" $(CROSS_VARS) -C $(LINUX_OBJ)	     \
 	-f $(PWD)/build/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) \
-	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)' \
+	LINUXINCLUDE='-I$$(srctree)/arch/$$(SRCARCH)/include -Iarch/$$(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
@@ -84,10 +89,10 @@ dist-hook:
 			-name CVS -o \
 			-name .svn -o \
 			-name .git -o \
-			-name .#* | xargs rm -rf
+			-name .#* -exec rm -rf {} \;
 	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  module-dist-hook
+		top_distdir="$(top_distdir)" distdir="$(distdir)" \
+		module-dist-hook
 
 EXTRA_DIST = @PACKAGE_TARNAME@.spec	\
 	build/Makefile 			\
@@ -95,75 +100,10 @@ EXTRA_DIST = @PACKAGE_TARNAME@.spec	\
 	build/gen_filelist.sh
 
 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'" ;; \
-		esac; \
-	done; \
-	RPMARGS="--define \"configure_args $$CONFIGURE_ARGS\""; \
-	if [ -n "@LINUX@" ]; then  \
-		RPMARGS="$$RPMARGS --define \"kdir @LINUX@\""; \
-		if [ -n "@LINUX_OBJ@" -a "@LINUX_OBJ@" != "@LINUX@" ]; then \
-			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" \
-			"*** 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 [ "@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 \
-		RPMARGS="$$RPMARGS --without lustre_tests"; \
-	fi; \
-	if [[ "X$(BUILD_SERVER)" = Xfalse ]]; then \
-		RPMARGS="$$RPMARGS --without servers"; \
-		if [ -n "$$CROSS_SUFFIX" ]; then \
-			RPMARGS="$$RPMARGS --define \"lustre_name lustre-client$$CROSS_SUFFIX\""; \
-		fi; \
-	fi; \
-	if [[ "X$(BUILD_OSD_LDISKFS)" = Xtrue ]]; then \
-		RPMARGS="$$RPMARGS --with ldiskfs"; \
-	fi; \
-	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
+	rpmbuild @RPMBUILD_BINARY_ARGS@ -ta $(distdir).tar.gz
 
 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
+	rpmbuild @RPMBUILD_SOURCE_ARGS@ -ts $(distdir).tar.gz
 
 # 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
@@ -200,12 +140,18 @@ debs:
 	ln -s /usr/share/modass/packages/ usr_share_modass/ && \
 	echo "lustre" > usr_share_modass/compliant.list && \
 	export MA_DIR=$$(pwd)/usr_share_modass && \
-	KVERS=$${KVERS:-$(LINUXRELEASE)}; \
-	m-a build $${KVERS:+-l $$KVERS} -i -u $$(pwd) lustre && \
+	KVERS=$${KVERS:-$(LINUXRELEASE)} && \
+	export KSRC_TREE=$(LINUX) && \
+	KSRC=$${KSRC:-$(LINUX_OBJ)} && \
+	m-a build $${KSRC:+-k $$KSRC} $${KVERS:+-l $$KVERS} -i -u $$(pwd) lustre && \
 	popd && \
-	VER=$$(sed -ne '1s/^lustre (\(.*-[0-9][0-9]*\)).*$$/\1/p' debian/changelog); \
+	VER=$$(sed -ne '1s/^lustre (\(.*-[0-9][0-9]*\)).*$$/\1/p' debian/changelog) && \
 	mkdir -p debs && \
-	mv ../liblustre_$${VER}_*.deb ../linux-patch-lustre_$${VER}_all.deb ../lustre-dev_$${VER}_*.deb ../lustre-source_$${VER}_all.deb ../lustre-tests_$${VER}_*.deb ../lustre-utils_$${VER}_*.deb ../lustre_$${VER}.dsc ../lustre_$${VER}_*.changes ../lustre_$${VER%-[0-9]*}.orig.tar.gz ../lustre_$${VER}.diff.gz ../lustre-client-modules-$${KVERS}_$${VER}_*.deb debs/
+	mv ../linux-patch-lustre_$${VER}_all.deb ../lustre-dev_$${VER}_*.deb \
+	   ../lustre-source_$${VER}_all.deb ../lustre-tests_$${VER}_*.deb \
+	   ../lustre-utils_$${VER}_*.deb ../lustre_$${VER}.dsc \
+	   ../lustre_$${VER}_*.changes ../lustre_$${VER}.tar.gz \
+	   ../lustre-client-modules-$${KVERS}_$${VER}_*.deb debs/
 
 EXTRA_DIST += config.h.in
 
@@ -247,7 +193,7 @@ checkstack:
 	{ for MOD in $$(find . -name "*.ko"); do			     \
 		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}
+	[ -f ${CSTKO} ] && ! diff -u ${CSTKO} ${CSTK} || head -n 30 ${CSTK}
 
 checkstack-update:
 	[ -f ${CSTK} ] && mv -f ${CSTK} ${CSTKO}
@@ -256,11 +202,14 @@ checkstack-clean:
 	rm -f ${CSTK} ${CSTKO}
 
 module-dist-hook:
-	if [ -d .git ]; then \
-		perl lustre/scripts/version_tag.pl --make_META > $(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 \
-		echo -e "I have no idea how to create a META file in $(distdir).\nPlease file a bug at http://bugzilla.lustre.org/"; \
+		echo -e "\n" \
+		"*** I have no idea how to create a META file in $(distdir).\n"\
+		"*** Please file a bug at https://jira.hpdd.intel.com/\n"; \
 		exit 1; \
 	fi