Whamcloud - gitweb
LU-17705 ptlrpc: replace synchronize_rcu() with rcu_barrier()
[fs/lustre-release.git] / autoMakefile.am
index 1a61ae7..b3c8186 100644 (file)
@@ -1,25 +1,71 @@
+# SPDX-License-Identifier: GPL-2.0
+
+#
+# This file is part of Lustre, http://www.lustre.org/
+#
+# autoMakefile.am
+#
+# Used by automake to create the top-level autoMakefile.in,
+# which is used by config.status to create the top-level
+# autoMakefile
+#
+
 SUBDIRS := @LDISKFS_SUBDIR@ \
        . \
-       @SNMP_SUBDIR@ \
        @LUSTREIOKIT_SUBDIR@ \
-       @LIBCFS_SUBDIR@ \
+       libcfs \
        lnet \
        lustre
 
 DIST_SUBDIRS := ldiskfs \
-       @SNMP_DIST_SUBDIR@ \
        lustre-iokit \
-       @LIBCFS_SUBDIR@ \
+       libcfs \
        lnet \
        lustre \
-       config contrib
+       cc-plugins \
+       config
 
 AUTOMAKE_OPTIONS = foreign
 
+if DEQUOTE_CC_VERSION_TEXT
+DEQUOTE = yes
+endif
+
 FIND_TAG_FILES_CMD = find $(top_srcdir) \
                     -path $(top_srcdir)/ldiskfs/linux-stage \
                     -prune -false -o -type f -name '*.[hc]'
 
+help:
+       @echo  'Cleaning targets:'
+       @echo  '  clean             - Remove generated object files but keep the files'
+       @echo  '                      generated by autotools; use `git clean -xdf` to'
+       @echo  '                      purge all files not tracked by git'
+       @echo  ''
+       @echo  'Generic targets:'
+       @echo  '  all               - Build all modules and utilities enabled by'
+       @echo  '                      autotools'
+       @echo  '  utils             - Build only userspace utilities'
+       @echo  '  checkpatch        - Run checkpatch.pl on latest commit'
+       @echo  '  checkstack        - Run checkstack.pl'
+       @echo  '  checkstack-update - Update checkstack.pl'
+       @echo  '  checkstack-clean  - Remove checkstack.pl artifacts'
+       @echo  ''
+       @echo  'Packaging targets:'
+       @echo  '  rpms              - Create RPM packages'
+       @echo  '  srpm              - Create source RPM packages'
+       @echo  '  dkms-rpm          - Create DKMS RPM packages'
+       @echo  '  dkms-srpm         - Create source DKMS RPM packages'
+       @echo  '  debs              - Create Debian packages'
+       @echo  '  dkms-debs         - Create DKMS Debian packages'
+
+checkpatch:
+       @git diff HEAD~1 | ./contrib/scripts/checkpatch.pl
+
+utils:
+       $(MAKE) -C libcfs/libcfs/util
+       $(MAKE) -C lnet/utils
+       $(MAKE) -C lustre/utils
+
 # these empty rules are needed so that automake doesn't add its own
 # recursive rules
 etags-recursive:
@@ -55,77 +101,391 @@ mkid:
        $(FIND_TAG_FILES_CMD) | xargs mkid
 
 
-doxygen:  doxygen-api doxygen-ref
-
-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 BUILT_IN_KO2IBLND
+       $(MAKE) sources -C lnet/klnds/in-kernel-o2iblnd || exit $$?
+endif
 
 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) DEQUOTE_CC_VERSION_TEXT=$(DEQUOTE) \
+       KBUILD_EXTRA_SYMBOLS="@INT_O2IB_SYMBOLS@ @EXTRA_SYMBOLS@" \
+       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 $@
+if EXTERNAL_KO2IBLND
+       $(MAKE) DEQUOTE_CC_VERSION_TEXT=$(DEQUOTE) BUILD_EXT_O2IB=yes \
+       KBUILD_EXTRA_SYMBOLS="$(PWD)/Module.symvers @EXT_O2IB_SYMBOLS@ @EXTRA_SYMBOLS@" \
+       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)$$(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)/lnet/klnds/o2iblnd -o tmp_include_depends -o scripts -o \
+       include/config/MARKER $@
+endif # EXTERNAL_KO2IBLND
 endif # LINUX
 
 endif # MODULES
 
-dist-hook:
+all: plugins
+
+# compiler plugins should be built as soon as possible,
+# so they can be available to the rest of the build
+# system
+plugins: undef.h
+if CC_PLUGINS
+       $(MAKE) all -C cc-plugins
+endif # CC_PLUGINS
+
+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                     \
+       lustre-dkms_pre-build.sh        \
+       lustre-dkms_post-build.sh       \
+       LUSTRE-VERSION-GEN              \
+       LUSTRE-VERSION-FILE             \
+       undef.h                         \
+       autogen.sh                      \
+       modules.order                   \
+       config/lustre-version.m4
+
+# 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 \
+               echo -e "\n" \
+       "*** Required util 'rpmbuild' missing. Please install the\n" \
+       "*** package for your distribution which provides 'rpmbuild',\n" \
+       "*** re-run configure, and try again.\n"; \
+               exit 1; \
+       fi; \
+       $(MKDIR_P) $(rpmbuilddir)/TMP   && \
+       $(MKDIR_P) $(rpmbuilddir)/BUILD && \
+       $(MKDIR_P) $(rpmbuilddir)/RPMS  && \
+       $(MKDIR_P) $(rpmbuilddir)/SRPMS && \
+       $(MKDIR_P) $(rpmbuilddir)/SPECS && \
+       $(MKDIR_P) $(rpmbuilddir)/SOURCES)
+
+if SERVER
+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-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)" \
+               --without servers \
+               --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@ \
+               --without servers \
+               --rebuild $(PACKAGE)-client-dkms-*.src.rpm || exit 1; \
+       cp $$rpmbuilddir/RPMS/*/*.rpm $(top_srcdir) || exit 1; \
+       rm -rf $$rpmbuilddir
 
-rpms: @PACKAGE_TARNAME@.spec dist Makefile
-       rpmbuild @RPMBUILD_BINARY_ARGS@ -ta $(distdir).tar.gz
+endif
 
-srpm: @PACKAGE_TARNAME@.spec dist Makefile
-       rpmbuild @RPMBUILD_SOURCE_ARGS@ -ts $(distdir).tar.gz
+dkms-srpms: dkms-srpm
+
+dkms-rpms: dkms-rpm
+
+rpms: srpm
+       rpmbuilddir=`mktemp -t -d rpmbuild-@PACKAGE@-$$USER-XXXXXXXX`; \
+       if test "x@CONFIG_CACHE_FILE@" != "x"; then \
+               export CONFIG_CACHE_FILE="@CONFIG_CACHE_FILE@"; \
+       fi; \
+       $(MAKE) $(AM_MAKEFLAGS) \
+               rpmbuilddir="$$rpmbuilddir" rpm-local || exit 1; \
+       $(RPMBUILD) \
+               --define "_tmppath $$rpmbuilddir/TMP" \
+               --define "_topdir $$rpmbuilddir" \
+               @RPMBUILD_BINARY_ARGS@ \
+               --rebuild $(distdir)-*.src.rpm || exit 1; \
+       cp $$rpmbuilddir/RPMS/*/*.rpm $(top_srcdir) || exit 1; \
+       rm -rf $$rpmbuilddir
 
+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 "dist %{nil}" \
+               -ts $(distdir).tar.gz || exit 1; \
+       cp $$rpmbuilddir/SRPMS/$(distdir)-*.src.rpm $(top_srcdir) || exit 1; \
+       rm -rf $$rpmbuilddir
+
+debs_common:
+       export SRC_GIT_HASH=$$(git log --oneline | head -1 | cut -d' ' -f1); \
+       rm -f /usr/src/lustre-$${SRC_GIT_HASH}.tar.bz2; \
+       if test -f /usr/src/lustre-$${SRC_GIT_HASH}.tar.bz2; then \
+               echo "************************************************************" ; \
+               echo "WARNING: move or remove /usr/src/lustre-$${SRC_GIT_HASH}.tar.bz2" ; \
+               echo "************************************************************" ; \
+               exit 1 ; \
+       fi
 # In the debs target, first make sure what's in the changelog reflects
-# the software version.  Here's how we could dig the version out of the
-# autoconf version file directly:
-# lversion=$$(sed -ne 's/m4_define(\[LUSTRE_[A-Z][A-Z]*\],\[\([0-9][0-9]*\)\])$$/\1/p'
-#      lustre/autoconf/lustre-version.ac | tr '\n' '.' | sed -e 's/.$//');
-#
-# 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:
-       lversion=$$(sed -ne 's/^#define VERSION "\(.*\)"$$/\1/p' config.h); \
+# the software version.
+debs: undef.h debs_common
+       cp -v debian/changelog.in debian/changelog ; \
+       export SRC_GIT_HASH=$$(git log --oneline | head -1 | cut -d' ' -f1); \
+       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 \
+               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_MULTIPLE_LNDS@" != "xno"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} multiple-lnds"; \
+       fi; \
+       if test "x@ENABLE_GNI@" = "xyes"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} gnilnd"; \
+       fi; \
+       if test "x@KFILND@" = "xkfilnd"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} kfilnd"; \
+       fi; \
+       if test "x@DPKG_EXT_O2IB@" != "x"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} ext_o2ib"; \
+               export O2IB_SRC="@EXT_O2IBPATH@"; \
+       fi ; \
+       if test "x@DPKG_INT_O2IB@" != "x"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} int_o2ib"; \
+       fi; \
+       if test "x@CONFIG_CACHE_FILE@" != "x"; then \
+               export CONFIG_CACHE_FILE="@CONFIG_CACHE_FILE@"; \
+       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.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|libssl3"; 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; \
-       rm -rf debs
-       dpkg-buildpackage -I.git -I\*.out[0-9]\* -I\*.swp || { \
+       if test "x@ENABLE_PINGER@" = "xyes"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} pinger"; \
+       elif test "x@ENABLE_PINGER@" = "xno"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} nopinger"; \
+       fi; \
+       if test "x@ENABLE_CHECKSUM@" = "xyes"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} checksum"; \
+       elif test "x@ENABLE_CHECKSUM@" = "xno"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} nochecksum"; \
+       fi; \
+       if test "x@ENABLE_FLOCK@" = "xyes"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} flock"; \
+       elif test "x@ENABLE_FLOCK@" = "xno"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} noflock"; \
+       fi; \
+       if test "x@ENABLE_LRU_RESIZE@" = "xyes"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} lru-resize"; \
+       elif test "x@ENABLE_LRU_RESIZE@" = "xno"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} nolru-resize"; \
+       fi; \
+       if test "x@ENABLE_MINDF@" = "xyes"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} mindf"; \
+       elif test "x@ENABLE_MINDF@" = "xno"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} nomindf"; \
+       fi; \
+       if test "x@ENABLE_FAIL_ALLOC@" = "xyes"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} fail-alloc"; \
+       elif test "x@ENABLE_FAIL_ALLOC@" = "xno"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} nofail-alloc"; \
+       fi; \
+       if test "x@ENABLE_INVARIANTS@" = "xyes"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} invariants"; \
+       elif test "x@ENABLE_INVARIANTS@" = "xno"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} noinvariants"; \
+       fi; \
+       if test "x@ENABLE_LU_REF@" = "xyes"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} lu_ref"; \
+       elif test "x@ENABLE_LU_REF@" = "xno"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} nolu_ref"; \
+       fi; \
+       if test "x@ENABLE_PGSTAT_TRACK@" = "xyes"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} pgstate-track"; \
+       elif test "x@ENABLE_PGSTAT_TRACK@" = "xno"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} nopgstate-track"; \
+       fi; \
+       if test "x@ENABLE_LIBCFS_CDEBUG@" = "xyes"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} libcfs-cdebug"; \
+       elif test "x@ENABLE_LIBCFS_CDEBUG@" = "xno"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} nolibcfs-cdebug"; \
+       fi; \
+       if test "x@ENABLE_LIBCFS_TRACE@" = "xyes"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} libcfs-trace"; \
+       elif test "x@ENABLE_LIBCFS_TRACE@" = "xno"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} nolibcfs-trace"; \
+       fi; \
+       if test "x@ENABLE_LIBCFS_ASSERT@" = "xyes"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} libcfs-assert"; \
+       elif test "x@ENABLE_LIBCFS_ASSERT@" = "xno"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} nolibcfs-assert"; \
+       fi; \
+       if test "x@ENABLE_PANIC_DUMPLOG@" = "xyes"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} panic_dumplog"; \
+       elif test "x@ENABLE_PANIC_DUMPLOG@" = "xno"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} nopanic_dumplog"; \
+       fi; \
+       if test "x@ENABLE_READLINE@" = "xyes"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} readline"; \
+       elif test "x@ENABLE_READLINE@" = "xno"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} noreadline"; \
+       fi; \
+       if test "x@ENABLE_LIBPTHREAD@" = "xyes"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} libpthread"; \
+       elif test "x@ENABLE_LIBPTHREAD@" = "xno"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} nolibpthread"; \
+       fi; \
+       if test "x@ENABLE_BACKOFF@" = "xyes"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} backoff"; \
+       elif test "x@ENABLE_BACKOFF@" = "xno"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} nobackoff"; \
+       fi; \
+       if test "x@ENABLE_EFENCE@" = "xyes"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} efence"; \
+       elif test "x@ENABLE_EFENCE@" = "xno"; then \
+               export DEB_BUILD_PROFILES="$${DEB_BUILD_PROFILES} noefence"; \
+       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}"; \
+       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; \
+       cp -v debian/control.main debian/control ; \
+       sed "s/_KVERS_/$(LINUXRELEASE)/g" debian/lustre-tests.install.in \
+               > debian/lustre-tests.install; \
+       tmpprofiles=`tr ' ' ',' <<< $$DEB_BUILD_PROFILES`; \
+       dpkg-buildpackage -us -uc -I.git -I\*.out[0-9]\* -I\*.swp -P$$tmpprofiles || { \
                rc=$${PIPESTATUS[0]}; \
+               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.main.bkp debian/control.main || true && \
+       cp $$debiantmp/control.modules.in.bkp debian/control.modules.in || true && \
+       cp -v debian/control.main debian/control || true ; \
        export KPKG_DEST_DIR="$$(pwd)/.." && \
        version=$$(sed -ne '1s/^lustre (\(.*\)).*$$/\1/p' debian/changelog) && \
        rm -rf debian/tmp/modules-deb && \
@@ -133,7 +493,7 @@ debs:
        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 && \
+       tar -C usr_src/ -xjf usr/src/lustre-$${SRC_GIT_HASH}.tar.bz2 && \
        chmod 755 usr_src/modules/lustre/debian/rules && \
        mkdir -p usr_share_modass && \
        ln -s /usr/share/modass/include/ usr_share_modass/ && \
@@ -143,47 +503,61 @@ debs:
        KVERS=$${KVERS:-$(LINUXRELEASE)} && \
        export KSRC_TREE=$(LINUX) && \
        KSRC=$${KSRC:-$(LINUX_OBJ)} && \
+       TARBALL=$$(realpath usr/src/lustre-$${SRC_GIT_HASH}.tar.bz2) \
        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; \
+       MULTILNDPKGS= ; \
+       if test "x@ENABLE_MULTIPLE_LNDS@" != "xno"; then \
+               debian/repackage-multiple-lnds.sh $${KVERS} $${VER} ../lustre-*-modules-$${KVERS}_$${VER}_*.deb ; \
+               MULTILNDPKGS="../lustre-lnet-module-*-$${KVERS}_$${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/
-
-EXTRA_DIST += config.h.in
+       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} $${MULTILNDPKGS} \
+          ../lustre_$${VER}.dsc ../lustre_$${VER}_*.changes \
+          ../lustre_$${VER}.tar.gz ../lustre-*-modules-$${KVERS}_$${VER}_*.deb \
+          ../lustre-*-dbgsym_$${VER}_*.ddeb ../lustre_$${VER}_*.buildinfo \
+          debs/
+
+dkms-debs: undef.h debs_common
+       cp -v debian/changelog.in debian/changelog ; \
+       export SRC_GIT_HASH=$$(git log --oneline | head -1 | cut -d' ' -f1); \
+       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}"; \
+       tmpprofiles=`tr ' ' ',' <<< $$DEB_BUILD_PROFILES`; \
+       echo "Kernel Source: $${KERNEL_SRC}"; \
+       echo "Kernel Object: $${KERNEL_OBJ}"; \
+       export BUILD_DKMS="true" && \
+       cp -v debian/control.main debian/control ; \
+       dpkg-buildpackage -us -uc -I.git -I\*.out[0-9]\* -I\*.swp -P$$tmpprofiles || { \
+               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 \
+          ../lustre-*-dbgsym_$${VER}_*.ddeb ../lustre_$${VER}_*.buildinfo \
+          debs/
 
-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
@@ -200,16 +574,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