b=22790 discover and utilize multiple CPUs

[fs/lustre-release.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index aa03070..a3e8541 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -75,19 +75,35 @@ MODS_PKG=lustre-client-modules
 BUILDDIR=.
 SRCDIR=.
 
+AVAIL_CPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
+ifneq ($(AVAIL_CPUS),1)
+      PMAKEARGS := -j $(AVAIL_CPUS)
+endif
+
 autogen: autogen-stamp
 autogen-stamp: patch-stamp
-       # There is really no reason to run this unless somebody adds a
-       # patch that patches the autoconf system, in which case they can
-       # include a patch for autogen.sh and uncomment this stuff.
-       #cp /usr/share/misc/config.sub config.sub
-       #cp /usr/share/misc/config.sub libsysio/config.sub
-       #cp /usr/share/misc/config.sub ldiskfs/config.sub
-       #cp /usr/share/misc/config.guess config.guess
-       #cp /usr/share/misc/config.guess libsysio/config.guess
-       #cp /usr/share/misc/config.guess ldiskfs/config.guess
-       #sh ./autogen.sh
-       #touch $@
+       # see if any patches requires us to run autogen
+       # (for a distribution release tarball, it is expected that if
+       #  downstream adds any patches that requires autogen.sh to be
+       #  run, a patch will be added by downstream to install the
+       #  needed autogen.sh scripts
+       #  see https://bugzilla.lustre.org/attachment.cgi?id=27156
+       #  for an example)
+       if grep "^--- .*\/autoconf" debian/patches/*; then \
+               if [ ! -f autogen.sh ]; then \
+                       echo "You have patches which require autogen.sh to be run, but it doesn't exist"; \
+                       echo "Please see https://bugzilla.lustre.org/attachment.cgi?id=27156"; \
+                       exit 1; \
+               fi; \
+               cp /usr/share/misc/config.sub config.sub; \
+               cp /usr/share/misc/config.sub libsysio/config.sub; \
+               cp /usr/share/misc/config.sub ldiskfs/config.sub; \
+               cp /usr/share/misc/config.guess config.guess; \
+               cp /usr/share/misc/config.guess libsysio/config.guess; \
+               cp /usr/share/misc/config.guess ldiskfs/config.guess; \
+               sh ./autogen.sh; \
+       fi; \
+       touch $@
 
 configure: configure-stamp
 configure-stamp: autogen-stamp debian/control.main debian/control.modules.in
@@ -114,7 +130,7 @@ build-arch build-indep: build
 build: build-stamp
 build-stamp: patch-stamp configure-stamp
        dh_testdir
-       $(MAKE) -C $(BUILDDIR)
+       $(MAKE) -C $(BUILDDIR) $(PMAKEARGS)
        $(MAKE) -C $(BUILDDIR) DESTDIR=$(TOP_DIR)/debian/tmp install
        # jump our lustre-client-modules into the control file if not using m-a
        if ! $(USE_MA); then \
@@ -359,7 +375,7 @@ kdist_configure: kdist_config
 binary-modules: prep-deb-files
        dh_testroot
        dh_clean -k
-       $(MAKE)
+       $(MAKE) $(PMAKEARGS)
        $(MAKE) install DESTDIR=$(CURDIR)/debian/$(PKGNAME)
        # Remove stuff that doesn't belong (no module-only target)
        cd $(CURDIR)/debian/$(PKGNAME) && rm -rf usr sbin etc