X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=autoMakefile.am;h=ed22c7063e98d4a252f486a5e56f8b38bd9c5a1a;hp=78f31ac61ae418efe3b0fecb91bed1c970258805;hb=475576e74ec315e316fe6528c97c437511b18872;hpb=a71ab04971382c77f708d6a082e8ee2fa845e9be

diff --git a/autoMakefile.am b/autoMakefile.am
index 78f31ac..ed22c70 100644
--- a/autoMakefile.am
+++ b/autoMakefile.am
@@ -1,18 +1,18 @@
 SUBDIRS := @LDISKFS_SUBDIR@ \
 	. \
-	@SNMP_SUBDIR@ \
 	@LUSTREIOKIT_SUBDIR@ \
 	@LIBCFS_SUBDIR@ \
+	@SNMP_SUBDIR@ \
 	lnet \
 	lustre
 
 DIST_SUBDIRS := ldiskfs \
-	@SNMP_DIST_SUBDIR@ \
 	lustre-iokit \
 	@LIBCFS_SUBDIR@ \
+	@SNMP_DIST_SUBDIR@ \
 	lnet \
 	lustre \
-	config contrib
+	config
 
 AUTOMAKE_OPTIONS = foreign
 
@@ -61,21 +61,18 @@ doxygen-%: build/doxyfile.%
 	doxygen $<
 
 if MODULES
-.PHONY: ldiskfs-sources lustre-sources
+.PHONY: ldiskfs-sources
 
 ldiskfs-sources:
 if LDISKFS_ENABLED
 	$(MAKE) sources -C @LDISKFS_SUBDIR@ || exit $$?
 endif
 
-lustre-sources:
-	$(MAKE) sources -C lustre || exit $$?
-
 if LINUX
 all-am: modules
 
-modules: ldiskfs-sources lustre-sources module-symvers
-	$(MAKE) CC="$(CC)" $(CROSS_VARS) -C $(LINUX_OBJ)	     \
+modules: undef.h ldiskfs-sources
+	$(MAKE) 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 \
@@ -84,20 +81,30 @@ endif # LINUX
 
 endif # MODULES
 
-dist-hook:
+undef.h: config.h.in
+	grep -v config.h.in config.h.in > $@
+
+dist-hook: undef.h
 	find $(distdir) -name .deps -o \
 			-name CVS -o \
 			-name .svn -o \
 			-name .git -o \
 			-name .#* -exec rm -rf {} \;
-	$(MAKE) $(AM_MAKEFLAGS) \
-		top_distdir="$(top_distdir)" distdir="$(distdir)" \
-		module-dist-hook
 
 EXTRA_DIST = @PACKAGE_TARNAME@.spec	\
 	build/Makefile 			\
 	build/Rules.in			\
-	build/gen_filelist.sh
+	config.h.in			\
+	undef.h				\
+	lustre-dkms_pre-build.sh	\
+	lustre-dkms_post-build.sh	\
+	LUSTRE-VERSION-GEN		\
+	LUSTRE-VERSION-FILE
+
+# 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
 
 rpm-local:
 	@(if test -z "$(RPMBUILD)"; then \
@@ -114,6 +121,39 @@ rpm-local:
 	$(MKDIR_P) $(rpmbuilddir)/SPECS && \
 	$(MKDIR_P) $(rpmbuilddir)/SOURCES)
 
+if SERVER
+DKMS_PACKAGE=$(PACKAGE)
+DKMS_SERVER=--with servers
+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) \
+		rpmbuilddir="$$rpmbuilddir" rpm-local || exit 1; \
+	$(RPMBUILD) \
+		--define "_tmppath $$rpmbuilddir/TMP" \
+		--define "_topdir $$rpmbuilddir" \
+		--define "_sourcedir $(top_srcdir)" \
+		$(DKMS_SERVER) \
+		--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@ \
+		--rebuild $(DKMS_PACKAGE)-dkms-*.src.rpm || exit 1; \
+	cp $$rpmbuilddir/RPMS/*/*.rpm $(top_srcdir) || exit 1; \
+	rm -rf $$rpmbuilddir
+
 rpms: srpm
 	rpmbuilddir=`mktemp -t -d rpmbuild-@PACKAGE@-$$USER-XXXXXXXX`; \
 	$(MAKE) $(AM_MAKEFLAGS) \
@@ -148,7 +188,7 @@ srpm: @PACKAGE_TARNAME@.spec dist Makefile
 # However, one cannot really run "make debs" without having done a
 # configure first, so we could use the easier method of digging the
 # version out of the config.h file.
-debs:
+debs: undef.h
 	lversion=$$(sed -ne 's/^#define VERSION "\(.*\)"$$/\1/p' config.h); \
 	cversion=$$(sed -ne '1s/^lustre (\(.*\)-[0-9][0-9]*).*$$/\1/p' debian/changelog); \
 	if [ "$$lversion" != "$$cversion" ]; then \
@@ -175,8 +215,13 @@ debs:
 	echo "lustre" > usr_share_modass/compliant.list && \
 	export MA_DIR=$$(pwd)/usr_share_modass && \
 	KVERS=$${KVERS:-$(LINUXRELEASE)} && \
-	[ "x@ENABLEO2IB@" != "x" ] && \
-	export IB_OPTIONS="--with-o2ib=@O2IBPATHS@" && \
+	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 && \
@@ -189,38 +234,10 @@ debs:
 	   ../lustre_$${VER}_*.changes ../lustre_$${VER}.tar.gz \
 	   ../lustre-client-modules-$${KVERS}_$${VER}_*.deb debs/
 
-EXTRA_DIST += config.h.in
-
 if USES_DPKG
 EXTRA_DIST += debian/*
 endif
 
-module-symvers-zfs:
-if ZFS_ENABLED
-	@if [ -f @SPL_OBJ@/@SPL_SYMBOLS@ ]; then \
-		cat @SPL_OBJ@/@SPL_SYMBOLS@ >>@SYMVERFILE@; \
-	elif [ -f @SPL_OBJ@/module/@SPL_SYMBOLS@ ]; then \
-		cat @SPL_OBJ@/module/@SPL_SYMBOLS@ >>@SYMVERFILE@; \
-	else \
-		echo -e "\n" \
-		"*** Missing spl symbols. Ensure you have built spl:\n" \
-		"*** - @SPL_OBJ@/@SYMVERFILE@\n"; \
-		exit 1; \
-	fi
-	@if [ -f @ZFS_OBJ@/@ZFS_SYMBOLS@ ]; then \
-		cat @ZFS_OBJ@/@ZFS_SYMBOLS@ >>@SYMVERFILE@; \
-	elif [ -f @ZFS_OBJ@/module/@ZFS_SYMBOLS@ ]; then \
-		cat @ZFS_OBJ@/module/@ZFS_SYMBOLS@ >>@SYMVERFILE@; \
-	else \
-		echo -e "\n" \
-		"*** Missing zfs symbols. Ensure you have built zfs:\n" \
-		"*** - @ZFS_OBJ@/@SYMVERFILE@\n"; \
-		exit 1; \
-	fi
-endif # ZFS_ENABLED
-
-module-symvers: module-symvers-zfs
-
 CSTK=/tmp/checkstack
 CSTKO=/tmp/checkstack.orig
 
@@ -236,16 +253,3 @@ checkstack-update:
 
 checkstack-clean:
 	rm -f ${CSTK} ${CSTKO}
-
-module-dist-hook:
-	@if [ -d .git ]; then \
-		perl lustre/scripts/version_tag.pl \
-			--make_META > $(distdir)/META; \
-	elif [ -f META ]; then \
-		cp META $(distdir)/META; \
-	else \
-		echo -e "\n" \
-		"*** I have no idea how to create a META file in $(distdir).\n"\
-		"*** Please file a bug at https://jira.hpdd.intel.com/\n"; \
-		exit 1; \
-	fi