X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=build%2FautoMakefile.am.toplevel;h=8b72d471bad37b8d466749d08d1227c6bd66b983;hb=6697349ea92c2c61a40b8f23655f66de60ca1501;hp=b442aefcb0527adc67f81e6c2875678c2e2151d8;hpb=d986321631f11ff106a664242525e8e0a79f53c5;p=fs%2Flustre-release.git

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index b442aef..8b72d47 100644
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -94,20 +94,31 @@ dist-hook:
 	  module-dist-hook
 
 EXTRA_DIST = @PACKAGE_TARNAME@.spec					\
-	build/Makefile build/autoMakefile.am.toplevel build/lbuild	\
-	build/Rules.in build/README.kernel-source			\
+	build/Makefile build/autoMakefile.am.toplevel build/lbuild*	\
+	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
+	build/mptlinux.spec.patch build/patches                         \
+	build/funcs.sh build/find_linux_rpms build/exit_traps.sh
 
 rpms-real: @PACKAGE_TARNAME@.spec dist Makefile
 	CONFIGURE_ARGS=$$(echo $$(eval echo $(ac_configure_args)) | sed -re 's/--(en|dis)able-tests//'); \
-	RPMARGS="--define \"configure_args $$CONFIGURE_ARGS\""; \
+	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
@@ -147,24 +158,8 @@ debs:
 	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" "$$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 || { \
+	rm -rf debs
+	dpkg-buildpackage -I.git -I\*.out[0-9]\* -I\*.swp || { \
 		rc=$${PIPESTATUS[0]}; \
 		[ $${rc} -gt 1 ] && exit $${rc}; \
 		exit 0; \
@@ -173,7 +168,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 && \
@@ -183,4 +178,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/