X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=build%2FautoMakefile.am.toplevel;h=9806d8d17112dc30947228f946019df5d846dd7c;hb=e14d4dd61348297f1627c65073a2d908e54977a3;hp=ba08fc96d36ff291843db035c0e510daad2b9b7a;hpb=116e447c76389f6eefdb818a6be5fbe475bc8dd1;p=fs%2Flustre-release.git

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index ba08fc9..9806d8d 100644
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -95,7 +95,7 @@ dist-hook:
 
 EXTRA_DIST = @PACKAGE_TARNAME@.spec					\
 	build/Makefile build/autoMakefile.am.toplevel build/lbuild	\
-	build/Rules.in build/README.kernel-source			\
+	build/Rules.in 							\
 	build/update_oldconfig						\
 	build/autoconf/lustre-build-linux.m4				\
 	build/autoconf/lustre-build-darwin.m4				\
@@ -146,7 +146,52 @@ 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 \
+		ver=$$(git describe --match [0-9v]\* --tags); \
+		if [[ $$ver = *-*-* ]]; then \
+			hash=$${ver##*-}; \
+			ffw=$${ver#*-}; \
+			ffw=$${ffw%-*}; \
+			ver=$${ver%%-*}; \
+		fi; \
+		if [ $$ffw -gt 0 ]; then \
+			tag=$$ver; \
+			if [[ $$ver =~ ^v([0-9]+_)+([0-9]+|RC[0-9]+)$$ ]]; then \
+				ver=$$(echo $$ver | \
+				  sed -e 's/^v\(.*\)/\1/' \
+				      -e 's/_RC[[0-9]].*$$//' \
+				      -e 's/_/./g'); \
+			fi; \
+			pdir="debian/patches"; \
+			if [ -d $$pdir ]; then \
+				rm -rf $$pdir; \
+			fi; \
+			mkdir $$pdir; \
+			git format-patch -o $$pdir $$tag..HEAD; \
+			pushd $$pdir; \
+			if [ -d ../patched ]; then \
+				rm -rf ../patched; \
+			fi; \
+			mkdir ../patched; \
+			rm -f 00list *.dpatch; \
+			for file in [0-9][0-9][0-9][0-9]-*.patch; do \
+				if ! grep -q "^ debian/changelog" $$file; then \
+					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; \
+				fi; \
+				rm -f $$file; \
+			done; \
+		fi; \
 	fi
+	rm -rf debs
 	dpkg-buildpackage || { \
 		rc=$${PIPESTATUS[0]}; \
 		[ $${rc} -gt 1 ] && exit $${rc}; \
@@ -156,7 +201,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 && \
@@ -166,4 +211,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}.tar.gz ../lustre-client-modules-$${KVERS}_$${VER}_*.deb debs/