X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=build%2FautoMakefile.am.toplevel;h=6f45678105023b19d5f65cf0de786604247ae8f2;hp=f2064fac6ada780249396cf28792da8979bde311;hb=2941269c348cfed9c22d02c45eb00687339adaaa;hpb=89045eb8b56aa1fd94fb6d03a59ee57ecb6faa2d

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index f2064fa..6f45678 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
 
@@ -94,23 +94,38 @@ dist-hook:
 	  module-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/Makefile build/autoMakefile.am.toplevel build/lbuild*	\
+	build/Rules.in 							\
+	build/update_oldconfig						\
 	build/autoconf/lustre-build-linux.m4				\
-	build/autoconf/lustre-build.m4
+	build/autoconf/lustre-build-darwin.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
 
 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//'); \
+	if [ -n "@LINUX@" ]; then \
+		CONFIGURE_ARGS=$$(echo $$(eval echo $$CONFIGURE_ARGS) | sed -re 's/--with-linux=[^ ][^ ]*//'); \
+		RPMARGS="--define \"kdir @LINUX@\""; \
+		CONFIGURE_ARGS=$$(echo $$(eval echo $$CONFIGURE_ARGS) | sed -re 's/--with-linux-obj=[^ ][^ ]*//'); \
+		if [ -n "@LINUX_OBJ@" -a "@LINUX_OBJ@" != "@LINUX@" ]; then \
+			RPMARGS="$$RPMARGS --define \"kobjdir @LINUX_OBJ@\""; \
+		fi; \
+	fi; \
+	CONFIGURE_ARGS=$$(echo $$(eval echo $$CONFIGURE_ARGS) | sed -re 's/--with-release=[^ ][^ ]*//'); \
+	RPMARGS="$$RPMARGS --define \"configure_args $$CONFIGURE_ARGS\""; \
+	if ! $(BUILD_TESTS); then \
+		RPMARGS="$$RPMARGS --define \"build_lustre_tests 0\""; \
+	fi; \
+	echo "Building Lustre RPM with $$RPMARGS"; \
+	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				\
@@ -142,8 +157,13 @@ 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 \
+		build/extract_patches .; \
 	fi
-	dpkg-buildpackage || { \
+	cat debian/patches/* | sed -ne '/^diff --git/h' -e '/^deleted file/{G;s/^.* b\/\(.*\)/\1/p;}' | xargs rm -f; \
+	rm -rf debs
+	dpkg-buildpackage -I.git -I\*.out[0-9]\* -I\*.swp || { \
 		rc=$${PIPESTATUS[0]}; \
 		[ $${rc} -gt 1 ] && exit $${rc}; \
 		exit 0; \
@@ -152,7 +172,7 @@ debs:
 	version=$$(sed -ne '1s/^lustre (\(.*\)).*$$/\1/p' debian/changelog) && \
 	rm -rf debian/tmp/modules-deb && \
 	mkdir debian/tmp/modules-deb && \
-	cd debian/tmp/modules-deb && \
+	pushd debian/tmp/modules-deb && \
 	dpkg -x ../../../../lustre-source_$${version}_all.deb $$(pwd) && \
 	mkdir usr_src/ && \
 	tar -C usr_src/ -xjf usr/src/lustre.tar.bz2 && \
@@ -162,4 +182,9 @@ debs:
 	ln -s /usr/share/modass/packages/ usr_share_modass/ && \
 	echo "lustre" > usr_share_modass/compliant.list && \
 	export MA_DIR=$$(pwd)/usr_share_modass && \
-	m-a build $${KVERS:+-l $$KVERS} -i -u $$(pwd) lustre
+	KVERS=$${KVERS:-$(LINUXRELEASE)}; \
+	m-a build $${KVERS:+-l $$KVERS} -i -u $$(pwd) lustre && \
+	popd && \
+	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/