X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=build%2FautoMakefile.am.toplevel;h=b5d8898cc3180ab7fecc74d63c8a894e70afbbe4;hp=792a53b34dd0f84cc847d3861b1446a2fee9633c;hb=a6527b28ba2082a445fbf584909a7791ce407ef3;hpb=86a7e6c2a4379aa991e36801fcea542e690c3bc8

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index 792a53b..b5d8898 100644
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -40,7 +40,7 @@ cscope:
 
 mkid:
 	$(FIND_TAG_FILES_CMD) | xargs mkid
-	
+
 
 doxygen:  doxygen-api doxygen-ref
 
@@ -95,23 +95,26 @@ dist-hook:
 
 EXTRA_DIST = @PACKAGE_TARNAME@.spec					\
 	build/Makefile build/autoMakefile.am.toplevel build/lbuild	\
-	build/linux-merge-config.awk build/linux-merge-modules.awk	\
-	build/linux-rhconfig.h build/lmake build/Rules.in		\
-	build/lustre-kernel-2.4.spec.in build/suse-functions.sh		\
-	build/suse-post.sh build/suse-postun.sh				\
-	build/suse-trigger-script.sh.in build/README.kernel-source	\
-	build/sles8-post.sh build/sles8-postun.sh build/sles8-pre.sh	\
-	build/sles8-update_INITRD_MODULES.sh				\
-	build/sles8-update_rcfile_setting.sh build/update_oldconfig	\
+	build/Rules.in 							\
+	build/update_oldconfig						\
 	build/autoconf/lustre-build-linux.m4				\
+	build/autoconf/lustre-build-darwin.m4				\
 	build/autoconf/lustre-build.m4 build/rdac_spec                  \
 	build/mptlinux.spec.patch build/patches
 
 rpms-real: @PACKAGE_TARNAME@.spec dist Makefile
-	rpmbuild -ta $(distdir).tar.gz
+	CONFIGURE_ARGS=$$(echo $$(eval echo $(ac_configure_args)) | sed -re 's/--(en|dis)able-tests//'); \
+	RPMARGS="--define \"configure_args $$CONFIGURE_ARGS\""; \
+	if ! $(BUILD_TESTS); then \
+		RPMARGS="$$RPMARGS --define \"build_lustre_tests 0\""; \
+	fi; \
+	eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz
 
 srpm-real: @PACKAGE_TARNAME@.spec dist Makefile
-	rpmbuild -ts $(distdir).tar.gz
+	if ! $(BUILD_TESTS); then \
+		RPMARGS="--define \"build_lustre_tests 0\""; \
+	fi; \
+	eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz
 
 rpms:
 	for subdir in $(RPM_SUBDIRS) ; do				\
@@ -143,6 +146,23 @@ debs:
 	cversion=$$(sed -ne '1s/^lustre (\(.*\)-[0-9][0-9]*).*$$/\1/p' debian/changelog); \
 	if [ "$$lversion" != "$$cversion" ]; then \
 		echo -e "1i\nlustre ($$lversion-1) unstable; urgency=low\n\n  * Automated changelog entry update\n\n -- Brian J. Murrell <brian@interlinx.bc.ca>  $$(date -R)\n\n.\nwq" | ed debian/changelog; \
+	fi; \
+	if [ -d .git ]; then \
+		pdir="debian/patches"; \
+		git format-patch -o $$pdir $$lversion..HEAD^; \
+		pushd $$pdir; \
+		rm -f 00list *.dpatch; \
+		for file in [0-9][0-9][0-9][0-9]-*.patch; do \
+			desc=$$(cat $$file | sed -e '1,/^$$/d' -e '/^---$$/,$$d'); \
+			dpatch_file=$${file/.patch/.dpatch}; \
+			sed -e '1,/^---$$/d' $$file | \
+			  dpatch patch-template -p "$${file%.patch}" "$$desc" > \
+			  $$dpatch_file; \
+			echo "faked by make debs run from git" > \
+			  ../patched/$$dpatch_file; \
+			echo $$dpatch_file >> 00list; \
+			rm -f $$file; \
+		done; \
 	fi
 	dpkg-buildpackage || { \
 		rc=$${PIPESTATUS[0]}; \