X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autoMakefile.am;h=b607947482143e233d08a79fa32bf69c58cd62df;hp=9b6dcfd0fd5d42fbc730f41c072cd1bcd53b892e;hb=0067260d030e45e8b159db80e80c86c2c12390cc;hpb=426194de03ad47497e99d281d86b5cdfc5142148

diff --git a/autoMakefile.am b/autoMakefile.am
index 9b6dcfd..b607947 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -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
@@ -149,23 +149,26 @@ rpms-real: @PACKAGE_TARNAME@.spec dist Makefile
 		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$$CROSS_SUFFIX\""; \
+		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