X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autoMakefile.am;h=79bcd658023691db1f51dafbe1ae2af0fd9a29e1;hp=77d98895c271f562138f886fb7bd450f8ba59ccf;hb=f60b861e3e526d33aa504f90385727ff74f290ba;hpb=55f0949551ecc7707cf2330673ed3d951d13c3ad;ds=sidebyside

diff --git a/autoMakefile.am b/autoMakefile.am
index 77d9889..79bcd65 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -1,5 +1,5 @@
 SUBDIRS := @LDISKFS_SUBDIR@ @SPL_SUBDIR@ @ZFS_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
+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@
 MODULE_SYMVERS_DEPS = module-symvers
@@ -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 \
@@ -100,15 +104,8 @@ dist-hook:
 	  module-dist-hook
 
 EXTRA_DIST = @PACKAGE_TARNAME@.spec					\
-	build/Makefile build/lbuild*					\
-	build/Rules.in 							\
-	build/update_oldconfig						\
-	build/autoconf/lustre-build-linux.m4				\
-	build/autoconf/lustre-build-darwin.m4				\
-	build/autoconf/lustre-build-ldiskfs.m4				\
-	build/autoconf/lustre-build.m4 build/rdac_spec                  \
-	build/mptlinux.spec.patch build/patches                         \
-	build/funcs.sh build/find_linux_rpms build/exit_traps.sh
+	build/Makefile 							\
+	build/Rules.in
 
 rpms-real: @PACKAGE_TARNAME@.spec dist Makefile
 	CONFIGURE_ARGS=$$(echo $$(eval echo $(ac_configure_args)) | \
@@ -132,6 +129,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)" = Xtrue ]]; then \
+		RPMARGS="$$RPMARGS --define \"build_lustre_osd_ldiskfs 1\""; \
+	fi; \
+	if [[ "X$(BUILD_OSD_ZFS)" = Xtrue ]]; then \
+		RPMARGS="$$RPMARGS --define \"build_lustre_osd_zfs 1\""; \
+	fi; \
 	echo "Building Lustre RPM with $$RPMARGS"; \
 	eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz
 
@@ -243,7 +246,7 @@ CSTKO=/tmp/checkstack.orig
 checkstack:
 	[ -f ${CSTK} -a ! -s ${CSTKO} ] && mv -f ${CSTK} ${CSTKO} || true
 	{ for MOD in $$(find . -name "*.ko"); do			     \
-		objdump -d $$MOD | perl build/checkstack.pl;                 \
+		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}