X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autoMakefile.am;h=064c317dea081ed3f5c17548604f7fb6d783a940;hp=fb20ce8f752ba03087c361655d0a4a8f036e6c7d;hb=2b7af478bdbf5c6701e0e49aefe34597bdee3126;hpb=020277f596168ed80d77ab50ef6a85a6e6e54d0a

diff --git a/autoMakefile.am b/autoMakefile.am
index fb20ce8..064c317 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -235,7 +235,7 @@ debs: undef.h
 	lversion=$$(echo @VERSION@ | tr '_' '-'); \
 	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; \
+		echo -e "1i\nlustre ($$lversion-1) unstable; urgency=low\n\n  * Automated changelog entry update\n\n -- Andreas Dilger <adilger@whamcloud.com>  $$(date -R)\n\n.\nwq" | ed debian/changelog; \
 	fi; \
 	rm -rf debs; \
 	if test "x@ENABLE_SERVER@" = "xyes"; then \
@@ -254,11 +254,33 @@ debs: undef.h
 		echo "SPL: $${SPL_SRC}"; \
 		echo "ZFS: $${ZFS_SRC}"; \
 	fi; \
-	export KERNEL_CFG="$(LINUX_CONFIG)"; \
+	if test "x@ENABLEO2IB@" != "xno"; then \
+		export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} o2ib"; \
+		export O2IB_SRC="@O2IBPATH@"; \
+	fi; \
+	if test "x@ENABLE_GSS@" = "xyes"; then \
+		export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} gss"; \
+	elif test "x@ENABLE_GSS@" = "xno"; then \
+		export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} nogss"; \
+	fi; \
+	if test "x@systemdsystemunitdir@" != "x"; then \
+		export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} systemd"; \
+	fi; \
+	export KERNEL_OBJ="$(LINUX_OBJ)"; \
 	export KERNEL_SRC="$(LINUX)"; \
 	echo "Enabled Build Profiles: $${DEB_BUILD_PROFILES}"; \
 	echo "Kernel Source: $${KERNEL_SRC}"; \
-	echo "Kernel Config: $${KERNEL_CFG}"; \
+	echo "Kernel Object: $${KERNEL_OBJ}"; \
+	if test "x@ENABLEO2IB@" = "xno"; then \
+		export IB_OPTIONS="--with-o2ib=no"; \
+	else \
+		if test "x@ENABLEO2IB@" != "xyes" && \
+		   test -n "@O2IBPATH@"; then \
+			export IB_OPTIONS="--with-o2ib=@O2IBPATH@"; \
+		else \
+			export IB_OPTIONS="--with-o2ib=yes"; \
+		fi; \
+	fi; \
 	dpkg-buildpackage -us -uc -I.git -I\*.out[0-9]\* -I\*.swp || { \
 		rc=$${PIPESTATUS[0]}; \
 		[ $${rc} -gt 1 ] && exit $${rc}; \
@@ -279,29 +301,51 @@ debs: undef.h
 	echo "lustre" > usr_share_modass/compliant.list && \
 	export MA_DIR=$$(pwd)/usr_share_modass && \
 	KVERS=$${KVERS:-$(LINUXRELEASE)} && \
-	if test "x@ENABLEO2IB@" = "xno"; then \
-		export IB_OPTIONS="--with-o2ib=no"; \
-	else \
-		if test -n "@O2IBPATH@"; then \
-			export IB_OPTIONS="--with-o2ib=@O2IBPATH@"; \
-		fi; \
-	fi; \
 	export KSRC_TREE=$(LINUX) && \
 	KSRC=$${KSRC:-$(LINUX_OBJ)} && \
 	m-a build $${KSRC:+-k $$KSRC} $${KVERS:+-l $$KVERS} -i -u $$(pwd) lustre && \
 	popd && \
 	VER=$$(sed -ne '1s/^lustre (\(.*-[0-9][0-9]*\)).*$$/\1/p' debian/changelog) && \
+	if test "x@ENABLE_SERVER@" = "xyes"; then \
+		DEB_SERVER_PKG="../lustre-resource-agents_$${VER}_*.deb"; \
+	fi; \
 	mkdir -p debs && \
 	mv ../lustre-dev_$${VER}_*.deb ../lustre-source_$${VER}_all.deb \
 	   ../lustre-iokit_$${VER}_*.deb ../lustre-tests_$${VER}_*.deb \
-	   ../lustre-*-utils_$${VER}_*.deb \
+	   ../lustre-*-utils_$${VER}_*.deb $${DEB_SERVER_PKG} \
 	   ../lustre_$${VER}.dsc ../lustre_$${VER}_*.changes \
 	   ../lustre_$${VER}.tar.gz ../lustre-*-modules-$${KVERS}_$${VER}_*.deb \
 	   debs/
 
-if USES_DPKG
+dkms-debs: undef.h
+	lversion=$$(echo @VERSION@ | tr '_' '-'); \
+	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; \
+	rm -rf debs; \
+	export DEB_BUILD_PROFILES="client"; \
+	export KERNEL_OBJ="$(LINUX_OBJ)"; \
+	export KERNEL_SRC="$(LINUX)"; \
+	echo "Enabled Build Profiles: $${DEB_BUILD_PROFILES}"; \
+	echo "Kernel Source: $${KERNEL_SRC}"; \
+	echo "Kernel Object: $${KERNEL_OBJ}"; \
+	export BUILD_DKMS="true" && \
+	dpkg-buildpackage -us -uc -I.git -I\*.out[0-9]\* -I\*.swp || { \
+		rc=$${PIPESTATUS[0]}; \
+		[ $${rc} -gt 1 ] && exit $${rc}; \
+		exit 0; \
+	}; \
+	VER=$$(sed -ne '1s/^lustre (\(.*-[0-9][0-9]*\)).*$$/\1/p' debian/changelog) && \
+	mkdir -p debs && \
+	mv ../lustre-dev_$${VER}_*.deb ../lustre-source_$${VER}_all.deb \
+	   ../lustre-iokit_$${VER}_*.deb ../lustre-tests_$${VER}_*.deb \
+	   ../lustre-*-utils_$${VER}_*.deb \
+	   ../lustre_$${VER}.dsc ../lustre_$${VER}_*.changes \
+	   ../lustre_$${VER}.tar.gz ../lustre-*-modules-dkms_$${VER}_*.deb \
+	   debs/
+
 EXTRA_DIST += debian/*
-endif
 
 CSTK=/tmp/checkstack
 CSTKO=/tmp/checkstack.orig