Whamcloud - gitweb
LU-11810 misc: allow Fixes: tag in commit signoff block
[fs/lustre-release.git] / autoMakefile.am
index efd73e7..92a3c4c 100644 (file)
@@ -1,16 +1,18 @@
-SUBDIRS := @LDISKFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ @SNMP_SUBDIR@ @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
-DIST_SUBDIRS := ldiskfs @SNMP_DIST_SUBDIR@ libsysio lustre-iokit @LIBCFS_SUBDIR@ lnet lustre config contrib
-
-@TESTS_TRUE@BUILD_TESTS = true
-@TESTS_FALSE@BUILD_TESTS = false
-@SERVER_TRUE@BUILD_SERVER = true
-@SERVER_FALSE@BUILD_SERVER = false
-@CLIENT_TRUE@BUILD_CLIENT = true
-@CLIENT_FALSE@BUILD_CLIENT = false
-@LDISKFS_ENABLED_TRUE@BUILD_OSD_LDISKFS = true
-@LDISKFS_ENABLED_FALSE@BUILD_OSD_LDISKFS = false
-@ZFS_ENABLED_TRUE@BUILD_OSD_ZFS = true
-@ZFS_ENABLED_FALSE@BUILD_OSD_ZFS = false
+SUBDIRS := @LDISKFS_SUBDIR@ \
+       . \
+       @LUSTREIOKIT_SUBDIR@ \
+       @LIBCFS_SUBDIR@ \
+       @SNMP_SUBDIR@ \
+       lnet \
+       lustre
+
+DIST_SUBDIRS := ldiskfs \
+       lustre-iokit \
+       @LIBCFS_SUBDIR@ \
+       @SNMP_DIST_SUBDIR@ \
+       lnet \
+       lustre \
+       config
 
 AUTOMAKE_OPTIONS = foreign
 
@@ -59,138 +61,217 @@ doxygen-%: build/doxyfile.%
        doxygen $<
 
 if MODULES
-sources: all-sources
+.PHONY: ldiskfs-sources
 
-all-sources: module-symvers
-       $(MAKE) sources -C lustre || exit $$?
+ldiskfs-sources:
+if LDISKFS_ENABLED
+       $(MAKE) sources -C @LDISKFS_SUBDIR@ || exit $$?
+endif
 
 if LINUX
 all-am: modules
 
-modules: $(DEP) all-sources
-       $(MAKE) CC="$(CC)" $(CROSS_VARS) -C $(LINUX_OBJ)             \
+modules: undef.h ldiskfs-sources
+       $(MAKE) LDFLAGS= CC="$(CC)" -C $(LINUX_OBJ) \
        -f $(PWD)/build/Makefile LUSTRE_LINUX_CONFIG=$(LINUX_CONFIG) \
-       LINUXINCLUDE='$(EXTRA_LNET_INCLUDE) -I$$(srctree)/arch/$$(SRCARCH)/include -I$$(srctree)/arch/$$(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),-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
 
 endif # MODULES
 
-dist-hook:
-       $(RM) $(distdir)/lustre-iokit/*.spec
+all: undef.h
+
+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 .#* | xargs rm -rf
+                       -name .#* -exec rm -rf {} \;
+
+EXTRA_DIST = @PACKAGE_TARNAME@.spec    \
+       build/Makefile                  \
+       build/Rules.in                  \
+       config.h.in                     \
+       lustre-dkms_pre-build.sh        \
+       lustre-dkms_post-build.sh       \
+       LUSTRE-VERSION-GEN              \
+       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 \
+               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) \
-         top_distdir="$(top_distdir)" distdir="$(distdir)" \
-         module-dist-hook
-
-EXTRA_DIST = @PACKAGE_TARNAME@.spec                                    \
-       build/Makefile                                                  \
-       build/Rules.in
+               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
 
-if ARCH_MIC
-EXTRA_DIST += build/gen_filelist.sh
 endif
 
-rpms-real: @PACKAGE_TARNAME@.spec dist Makefile
-       @CONFIGURE_ARGS=""; \
-       for arg in $(ac_configure_args); do \
-               case $$arg in \
-                       --with-release=* ) ;; \
-                       --enable-tests | --disable-tests ) ;; \
-                       --with-linux=* | --with-linux-obj=* ) ;; \
-                       * ) CONFIGURE_ARGS="$$CONFIGURE_ARGS '$$arg'" ;; \
-               esac; \
-       done; \
-       RPMARGS="--define \"configure_args $$CONFIGURE_ARGS\""; \
-       if [ -n "@LINUX@" ]; then  \
-               RPMARGS="$$RPMARGS --define \"kdir @LINUX@\""; \
-               if [ -n "@LINUX_OBJ@" -a "@LINUX_OBJ@" != "@LINUX@" ]; then \
-                       RPMARGS="$$RPMARGS --define \"kobjdir @LINUX_OBJ@\""; \
-               fi; \
-       fi; \
-       if [ -n "@CROSS_PATH@" ]; then \
-               if [[ "X$(BUILD_SERVER)" = Xtrue ]]; then \
-                       echo -e "\n" \
-                       "*** Don't support cross compilation for the Intel(R) Xeon Phi(TM) card.\n"; \
-                       exit 1; \
-               fi; \
-               CROSS_SUFFIX="-mic"; \
-               RPMARGS="$$RPMARGS --define \"post_script build/gen_filelist.sh\""; \
-               RPMARGS="$$RPMARGS --define \"cross_path @CROSS_PATH@\""; \
-               RPMARGS="$$RPMARGS --define \"rootdir %{cross_path}\""; \
-               RPMARGS="$$RPMARGS --define \"_prefix %{cross_path}/usr\""; \
-               RPMARGS="$$RPMARGS --define \"_mandir %{_prefix}/share/man\""; \
-               RPMARGS="$$RPMARGS --define \"_sysconfdir %{cross_path}/etc\""; \
-               RPMARGS="$$RPMARGS --define \"make_args @CROSS_VARS@\""; \
-               if [ -s @LINUX@/../../.ver.build ]; then \
-                       MPSS_VERSION=$$(sed -ne 's/DRIVERS_\(.*\)-.*/\1/p' @LINUX@/../../.ver.build); \
-                       if [ -n "$$MPSS_VERSION" ]; then \
-                               RPMARGS="$$RPMARGS --define \"cross_requires intel-mic-gpl = 2.1.$$MPSS_VERSION\""; \
-                       fi; \
-               fi; \
-       fi; \
-       if [[ "X$(BUILD_TESTS)" = Xfalse ]]; then \
-               RPMARGS="$$RPMARGS --without lustre_tests"; \
-       fi; \
-       if [[ "X$(BUILD_SERVER)" = Xfalse ]]; then \
-               RPMARGS="$$RPMARGS --without servers"; \
-               if [ -n "$$CROSS_SUFFIX" ]; then \
-                       RPMARGS="$$RPMARGS --define \"lustre_name lustre-client$$CROSS_SUFFIX\""; \
-               fi; \
-       fi; \
-       if [[ "X$(BUILD_OSD_LDISKFS)" = Xtrue ]]; then \
-               RPMARGS="$$RPMARGS --with ldiskfs"; \
-       fi; \
-       if [[ "X$(BUILD_OSD_ZFS)" = Xtrue ]]; then \
-               RPMARGS="$$RPMARGS --with zfs"; \
-       fi; \
-       echo "Building Lustre RPM with $$RPMARGS"; \
-       eval rpmbuild $$RPMARGS -ta $(distdir).tar.gz
-
-srpm-real: @PACKAGE_TARNAME@.spec dist Makefile
-       if [[ "X$(BUILD_TESTS)" = Xfalse ]]; then \
-               RPMARGS="--without lustre_tests"; \
-       fi; \
-       eval rpmbuild $$RPMARGS -ts $(distdir).tar.gz
+dkms-srpms: dkms-srpm
 
-rpms:
-if BUILD_LUSTREIOKIT
-       $(MAKE) -C @LUSTREIOKIT_SUBDIR@ $(AM_MAKEFLAGS) $@
-endif
-       $(MAKE) $(AM_MAKEFLAGS) rpms-real
+dkms-rpms: dkms-rpm
 
-srpm:
-if BUILD_LUSTREIOKIT
-       $(MAKE) -C @LUSTREIOKIT_SUBDIR@ $(AM_MAKEFLAGS) $@
-endif
-       $(MAKE) $(AM_MAKEFLAGS) srpm-real
+rpms: srpm
+       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" \
+               @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
 
 # 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
+       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
-       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; \
+       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 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 && \
@@ -205,44 +286,62 @@ debs:
        ln -s /usr/share/modass/packages/ usr_share_modass/ && \
        echo "lustre" > usr_share_modass/compliant.list && \
        export MA_DIR=$$(pwd)/usr_share_modass && \
-       KVERS=$${KVERS:-$(LINUXRELEASE)}; \
-       m-a build $${KVERS:+-l $$KVERS} -i -u $$(pwd) lustre && \
+       KVERS=$${KVERS:-$(LINUXRELEASE)} && \
+       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; \
+       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); \
+       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 ../liblustre_$${VER}_*.deb ../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%-[0-9]*}.orig.tar.gz ../lustre_$${VER}.diff.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} \
+          ../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
-
-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
@@ -252,20 +351,10 @@ checkstack:
        { for MOD in $$(find . -name "*.ko"); do                             \
                objdump -d $$MOD | perl contrib/scripts/checkstack.pl;       \
          done } | grep -v " bug " | sort -nr | uniq > ${CSTK}
-       [ -f ${CSTKO} ] && ! diff -u ${CSTKO} ${CSTK} || head -30 ${CSTK}
+       [ -f ${CSTKO} ] && ! diff -u ${CSTKO} ${CSTK} || head -30 ${CSTK}
 
 checkstack-update:
        [ -f ${CSTK} ] && mv -f ${CSTK} ${CSTKO}
 
 checkstack-clean:
        rm -f ${CSTK} ${CSTKO}
-
-module-dist-hook:
-       if [ -d CVS -o -d .git ]; then \
-               perl lustre/scripts/make_META.pl > $(distdir)/META; \
-       elif [ -f META ]; then \
-               cp META $(distdir)/META; \
-       else \
-               echo -e "I have no idea how to create a META file in $(distdir).\nPlease file a bug at http://bugzilla.lustre.org/"; \
-               exit 1; \
-       fi