X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autoMakefile.am;h=b7bcff34da77796784cc52fe274b7e6bce595ce9;hp=ebf2dca6cfcd6f943147b5f7c33227ad7691cc6c;hb=979f5e1db041dc49585b97c4915a6bc3e58435da;hpb=eb70bc0b63a6aae50c7b9ab9fc84b6b0e090428d

diff --git a/autoMakefile.am b/autoMakefile.am
index ebf2dca..b7bcff3 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -1,15 +1,15 @@
 SUBDIRS := @LDISKFS_SUBDIR@ \
 	. \
 	@LUSTREIOKIT_SUBDIR@ \
-	@LIBCFS_SUBDIR@ \
 	@SNMP_SUBDIR@ \
+	libcfs \
 	lnet \
 	lustre
 
 DIST_SUBDIRS := ldiskfs \
 	lustre-iokit \
-	@LIBCFS_SUBDIR@ \
 	@SNMP_DIST_SUBDIR@ \
+	libcfs \
 	lnet \
 	lustre \
 	config
@@ -74,7 +74,7 @@ all-am: modules
 modules: undef.h ldiskfs-sources
 	$(MAKE) LDFLAGS= CC="$(CC)" -C $(LINUX_OBJ) \
 	-f $(PWD)/build/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) \
-	LINUXINCLUDE='-I$$(srctree)/arch/$$(SRCARCH)/include -Iarch/$$(SRCARCH)/include/generated -Iinclude $$(if $$(KBUILD_SRC),-Iinclude2 -I$$(srctree)/include) -I$$(srctree)/arch/$$(SRCARCH)/include/uapi -Iarch/$$(SRCARCH)/include/generated/uapi -I$$(srctree)/include/uapi -Iinclude/generated/uapi -include $(CONFIG_INCLUDE)' \
+	LINUXINCLUDE='-I$$(srctree)/arch/$$(SRCARCH)/include -Iarch/$$(SRCARCH)/include/generated -Iinclude $$(if $$(KBUILD_SRC)$$(building_out_of_srctree),-Iinclude2 -I$$(srctree)/include) -I$$(srctree)/arch/$$(SRCARCH)/include/uapi -Iarch/$$(SRCARCH)/include/generated/uapi -I$$(srctree)/include/uapi -Iinclude/generated/uapi -include $(CONFIG_INCLUDE)' \
 	$(MODULE_TARGET)=$(PWD) -o tmp_include_depends -o scripts -o \
 	include/config/MARKER $@
 endif # LINUX
@@ -254,11 +254,27 @@ debs: undef.h
 		echo "SPL: $${SPL_SRC}"; \
 		echo "ZFS: $${ZFS_SRC}"; \
 	fi; \
+	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"; \
+		debiantmp=$$(mktemp -t -d debbuild-$$USER-XXXXXXXX) ; \
+		cp debian/control $$debiantmp/control.bkp ; \
+		cp debian/control.main $$debiantmp/control.main.bkp ; \
+		cp debian/control.modules.in $$debiantmp/control.modules.in.bkp ; \
+		sed -i "s+^\(Build-Depends: .*\)$$+\1, libkrb5-dev, libssl-dev+" debian/control.main ; \
+		awk 'BEGIN{change=0} $$1 == "Package:" {if (($$2 == "lustre-client-utils") || ($$2 == "lustre-server-utils")) change=1; else change=0; fi } {if (($$1 == "Depends:") && change) print $$0 ", libgssapi-krb5-2, libkrb5-3, libssl1.1"; else print; fi}' debian/control.main > $$debiantmp/control.main && mv $$debiantmp/control.main debian/control.main ; \
+		sed -i "s+^\(Build-Depends: .*\)$$+\1, libkrb5-dev, libssl-dev+" debian/control.modules.in ; \
 	elif test "x@ENABLE_GSS@" = "xno"; then \
 		export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} nogss"; \
 	fi; \
+	if test "x@ENABLE_CRYPTO@" = "xyes"; then \
+		export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} crypto"; \
+	elif test "x@ENABLE_CRYPTO@" = "xno"; then \
+		export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} nocrypto"; \
+	fi; \
 	if test "x@systemdsystemunitdir@" != "x"; then \
 		export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} systemd"; \
 	fi; \
@@ -279,9 +295,15 @@ debs: undef.h
 	fi; \
 	dpkg-buildpackage -us -uc -I.git -I\*.out[0-9]\* -I\*.swp || { \
 		rc=$${PIPESTATUS[0]}; \
+		cp $$debiantmp/control.bkp debian/control || true && \
+		cp $$debiantmp/control.main.bkp debian/control.main || true && \
+		cp $$debiantmp/control.modules.in.bkp debian/control.modules.in || true && \
 		[ $${rc} -gt 1 ] && exit $${rc}; \
 		exit 0; \
 	}; \
+	cp $$debiantmp/control.bkp debian/control || true && \
+	cp $$debiantmp/control.main.bkp debian/control.main || true && \
+	cp $$debiantmp/control.modules.in.bkp debian/control.modules.in || true && \
 	export KPKG_DEST_DIR="$$(pwd)/.." && \
 	version=$$(sed -ne '1s/^lustre (\(.*\)).*$$/\1/p' debian/changelog) && \
 	rm -rf debian/tmp/modules-deb && \