From: Brian J. Murrell <brian.murrell@oracle.com>
Date: Sun, 19 Sep 2010 04:27:13 +0000 (-0400)
Subject: move .debs into /debs
X-Git-Tag: v1_8_4_53~9
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=b8e08949ab3d6cc9db3d6d9c144a5e36d052d225;p=fs%2Flustre-release.git

move .debs into /debs

Move the built .debs from .. into a /debs subdir of the build tree.
We in fact could almost make debian/rules do this using dh_builddeb's
--destdir argument, however dpkg-genchanges wants to find them in ..
and there is no way to pass dpkg-genchange's -u argument to it from
dpkg-buildpackage.  So thus, our hack.
---

diff --git a/build/autoMakefile.am.toplevel b/build/autoMakefile.am.toplevel
index ae56e83..919e90f 100644
--- a/build/autoMakefile.am.toplevel
+++ b/build/autoMakefile.am.toplevel
@@ -197,6 +197,7 @@ debs:
 			done; \
 		fi; \
 	fi
+	rm -rf debs
 	dpkg-buildpackage || { \
 		rc=$${PIPESTATUS[0]}; \
 		[ $${rc} -gt 1 ] && exit $${rc}; \
@@ -206,7 +207,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 && \
@@ -216,4 +217,8 @@ 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
+	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/