X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autoMakefile.am;h=d39d16aa70308a1a6eafec92a4f2c14279ea4796;hp=1b0401381c5dcabd208a8678332756601df2deeb;hb=c648f5ddc3e84705df02b43d202d794fde93e3a6;hpb=f2d28899a2c3b5a427f4322623ba138887fe6adc

diff --git a/autoMakefile.am b/autoMakefile.am
index 1b04013..d39d16a 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -72,7 +72,7 @@ if LINUX
 all-am: modules
 
 modules: undef.h ldiskfs-sources
-	$(MAKE) CC="$(CC)" -C $(LINUX_OBJ) \
+	$(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)' \
 	$(MODULE_TARGET)=$(PWD) -o tmp_include_depends -o scripts -o \
@@ -81,6 +81,8 @@ endif # LINUX
 
 endif # MODULES
 
+all: undef.h
+
 undef.h: config.h.in
 	grep -v config.h.in config.h.in > $@
 
@@ -95,16 +97,17 @@ EXTRA_DIST = @PACKAGE_TARNAME@.spec	\
 	build/Makefile 			\
 	build/Rules.in			\
 	config.h.in			\
-	undef.h				\
 	lustre-dkms_pre-build.sh	\
 	lustre-dkms_post-build.sh	\
 	LUSTRE-VERSION-GEN		\
-	LUSTRE-VERSION-FILE
+	LUSTRE-VERSION-FILE		\
+	undef.h
 
 # contrib is a directory.  Putting a directory in EXTRA_DIST
 # recursively includes the entire directory contents in the
 # distribution tarball (the tarball created with "make dist").
 EXTRA_DIST += contrib
+EXTRA_DIST += rpm
 
 rpm-local:
 	@(if test -z "$(RPMBUILD)"; then \
@@ -122,15 +125,55 @@ rpm-local:
 	$(MKDIR_P) $(rpmbuilddir)/SOURCES)
 
 if SERVER
-DKMS_PACKAGE=$(PACKAGE)
-DKMS_SERVER=--with servers
+dkms-srpm: $(PACKAGE)-dkms.spec dist Makefile
+	rpmbuilddir=`mktemp -t -d rpmbuild-@PACKAGE@-$$USER-XXXXXXXX`; \
+	$(MAKE) $(AM_MAKEFLAGS) \
+		rpmbuilddir="$$rpmbuilddir" rpm-local || exit 1; \
+	$(RPMBUILD) \
+		--define "_tmppath $$rpmbuilddir/TMP" \
+		--define "_topdir $$rpmbuilddir" \
+		--define "_sourcedir $(top_srcdir)" \
+		--with servers --with zfs -without ldiskfs \
+		--bs $(PACKAGE)-dkms.spec || exit 1; \
+	$(RPMBUILD) \
+		--define "_tmppath $$rpmbuilddir/TMP" \
+		--define "_topdir $$rpmbuilddir" \
+		--define "_sourcedir $(top_srcdir)" \
+		--with servers --without zfs --with ldiskfs \
+		--bs $(PACKAGE)-dkms.spec || exit 1; \
+	$(RPMBUILD) \
+		--define "_tmppath $$rpmbuilddir/TMP" \
+		--define "_topdir $$rpmbuilddir" \
+		--define "_sourcedir $(top_srcdir)" \
+		--with servers --with zfs --with ldiskfs \
+		--bs $(PACKAGE)-dkms.spec || exit 1; \
+	cp $$rpmbuilddir/SRPMS/*.src.rpm $(top_srcdir) || exit 1; \
+	rm -rf $$rpmbuilddir
+
+dkms-rpm: dkms-srpm
+	rpmbuilddir=`mktemp -t -d rpmbuild-@PACKAGE@-$$USER-XXXXXXXX`; \
+	$(RPMBUILD) \
+		--define "_tmppath $$rpmbuilddir/TMP" \
+		--define "_topdir $$rpmbuilddir" \
+		@RPMBUILD_BINARY_ARGS@ \
+		--with servers --with zfs --without ldiskfs \
+		--rebuild $(PACKAGE)-zfs-dkms-*.src.rpm || exit 1; \
+	$(RPMBUILD) \
+		--define "_tmppath $$rpmbuilddir/TMP" \
+		--define "_topdir $$rpmbuilddir" \
+		@RPMBUILD_BINARY_ARGS@ \
+		--with servers --without zfs --with ldiskfs \
+		--rebuild $(PACKAGE)-ldiskfs-dkms-*.src.rpm || exit 1; \
+	$(RPMBUILD) \
+		--define "_tmppath $$rpmbuilddir/TMP" \
+		--define "_topdir $$rpmbuilddir" \
+		@RPMBUILD_BINARY_ARGS@ \
+		--with servers --with zfs --with ldiskfs \
+		--rebuild $(PACKAGE)-all-dkms-*.src.rpm || exit 1; \
+	cp $$rpmbuilddir/RPMS/*/*.rpm $(top_srcdir) || exit 1; \
+	rm -rf $$rpmbuilddir
 else
-DKMS_PACKAGE=$(PACKAGE)-client
-DKMS_SERVER=--without servers
-endif
 
-# Only zfs Lustre DKMS Server is supported, so previous configure command
-# must use related parameters for success.
 dkms-srpm: $(PACKAGE)-dkms.spec dist Makefile
 	rpmbuilddir=`mktemp -t -d rpmbuild-@PACKAGE@-$$USER-XXXXXXXX`; \
 	$(MAKE) $(AM_MAKEFLAGS) \
@@ -139,7 +182,7 @@ dkms-srpm: $(PACKAGE)-dkms.spec dist Makefile
 		--define "_tmppath $$rpmbuilddir/TMP" \
 		--define "_topdir $$rpmbuilddir" \
 		--define "_sourcedir $(top_srcdir)" \
-		$(DKMS_SERVER) \
+		--without servers \
 		--bs $(PACKAGE)-dkms.spec || exit 1; \
 	cp $$rpmbuilddir/SRPMS/*.src.rpm $(top_srcdir) || exit 1; \
 	rm -rf $$rpmbuilddir
@@ -150,10 +193,17 @@ dkms-rpm: dkms-srpm
 		--define "_tmppath $$rpmbuilddir/TMP" \
 		--define "_topdir $$rpmbuilddir" \
 		@RPMBUILD_BINARY_ARGS@ \
-		--rebuild $(DKMS_PACKAGE)-dkms-*.src.rpm || exit 1; \
+		--without servers \
+		--rebuild $(PACKAGE)-client-dkms-*.src.rpm || exit 1; \
 	cp $$rpmbuilddir/RPMS/*/*.rpm $(top_srcdir) || exit 1; \
 	rm -rf $$rpmbuilddir
 
+endif
+
+dkms-srpms: dkms-srpm
+
+dkms-rpms: dkms-rpm
+
 rpms: srpm
 	rpmbuilddir=`mktemp -t -d rpmbuild-@PACKAGE@-$$USER-XXXXXXXX`; \
 	$(MAKE) $(AM_MAKEFLAGS) \
@@ -170,10 +220,10 @@ srpm: @PACKAGE_TARNAME@.spec dist Makefile
 	rpmbuilddir=`mktemp -t -d rpmbuild-@PACKAGE@-$$USER-XXXXXXXX`; \
 	$(MAKE) $(AM_MAKEFLAGS) \
 		rpmbuilddir="$$rpmbuilddir" rpm-local || exit 1; \
+	cp $(top_srcdir)/rpm/* $(top_srcdir); \
 	$(RPMBUILD) \
 		--define "_tmppath $$rpmbuilddir/TMP" \
 		--define "_topdir $$rpmbuilddir" \
-		--define "build_src_rpm 1" \
 		--define "dist %{nil}" \
 		-ts $(distdir).tar.gz || exit 1; \
 	cp $$rpmbuilddir/SRPMS/$(distdir)-*.src.rpm $(top_srcdir) || exit 1; \
@@ -187,12 +237,38 @@ debs: undef.h
 	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
-	dpkg-buildpackage -I.git -I\*.out[0-9]\* -I\*.swp || { \
+	rm -rf debs; \
+	if test "x@ENABLE_SERVER@" = "xyes"; then \
+		DEB_BUILD_PROFILES="server"; \
+	else \
+		DEB_BUILD_PROFILES="client"; \
+	fi; \
+	if test "x@ENABLE_LDISKFS@" = "xyes"; then \
+		export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} ldiskfs"; \
+	fi; \
+	if test "x@ENABLE_ZFS@" = "xyes"; then \
+		export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} zfs"; \
+		export SPL_SRC="@SPL@"; \
+		export ZFS_SRC="@ZFS@"; \
+		echo "ZFS support is enabled. Will expect pre-compiled SPL and ZFS sources in:"; \
+		echo "SPL: $${SPL_SRC}"; \
+		echo "ZFS: $${ZFS_SRC}"; \
+	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; \
+	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}"; \
+	dpkg-buildpackage -us -uc -I.git -I\*.out[0-9]\* -I\*.swp || { \
 		rc=$${PIPESTATUS[0]}; \
 		[ $${rc} -gt 1 ] && exit $${rc}; \
 		exit 0; \
-	}
+	}; \
 	export KPKG_DEST_DIR="$$(pwd)/.." && \
 	version=$$(sed -ne '1s/^lustre (\(.*\)).*$$/\1/p' debian/changelog) && \
 	rm -rf debian/tmp/modules-deb && \
@@ -211,8 +287,11 @@ debs: undef.h
 	if test "x@ENABLEO2IB@" = "xno"; then \
 		export IB_OPTIONS="--with-o2ib=no"; \
 	else \
-		if test -n "@O2IBPATH@"; then \
+		if test "x@ENABLEO2IB@" != "xyes" && \
+		   test -n "@O2IBPATH@"; then \
 			export IB_OPTIONS="--with-o2ib=@O2IBPATH@"; \
+		else \
+			export IB_OPTIONS="--with-o2ib=yes"; \
 		fi; \
 	fi; \
 	export KSRC_TREE=$(LINUX) && \
@@ -220,16 +299,46 @@ debs: undef.h
 	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 ../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/
+	mv ../lustre-dev_$${VER}_*.deb ../lustre-source_$${VER}_all.deb \
+	   ../lustre-iokit_$${VER}_*.deb ../lustre-tests_$${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/
+
+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/
 
-if USES_DPKG
 EXTRA_DIST += debian/*
-endif
 
 CSTK=/tmp/checkstack
 CSTKO=/tmp/checkstack.orig