Merge pull request dell#1 from scaronni/master

Parallel make & bugfixes

dkms

@@ -130,6 +130,7 @@ show_usage()
     echo $"              [--binaries-only] [--source-only] [-r release (SuSE)] [--verbose]"
     echo $"              [--size] [--spec=specfile] [--media=floppy|iso|tar] [--legacy-postinst=0|1]"
     echo $"              [--no-depmod]"
+    echo $"              [-j number]"
 }
 
 VER()
@@ -148,6 +149,18 @@ VER()
         -e 's: ::g'
 }
 
+# Find out how many CPUs there are so that we may pass an appropriate -j
+# option to make. Ignore hyperthreading for now.
+get_num_cpus()
+{
+   # use nproc(1) from coreutils 8.1-1+ if available, otherwise single job
+   if [ -x /usr/bin/nproc ]; then
+	nproc
+   else
+	echo "1"
+  fi
+}
+
 # Figure out the correct module suffix for the kernel we are currently
 # dealing with, which may or may not be the currently installed kernel.
 set_module_suffix()
@@ -1148,7 +1161,7 @@ prepare_kernel()
         invoke_command "cp /boot/vmlinuz.version.h include/linux/version.h" "using /boot/vmlinux.version.h"
         invoke_command "cp -f $kernel_config .config" "using $kernel_config"
         invoke_command "make KERNELRELEASE=$1 cloneconfig" "make cloneconfig" background
-        invoke_command "make CONFIG_MODVERSIONS=1 KERNELRELEASE=$1 dep" "make CONFIG_MODVERSIONS=1 dep" background
+        invoke_command "make -j$parallel_jobs CONFIG_MODVERSIONS=1 KERNELRELEASE=$1 dep" "make CONFIG_MODVERSIONS=1 dep" background
     elif grep -q rhconfig.h $kernel_source_dir/include/linux/{modversions,version}.h 2>/dev/null; then
         echo $"Running Red Hat style preparation routine"
         invoke_command "make clean" "make clean" background
@@ -1194,9 +1207,9 @@ prepare_kernel()
 
         invoke_command "make KERNELRELEASE=$1 oldconfig" "make oldconfig" background
         if [[ $(VER $1) < $(VER 2.5) ]]; then
-            invoke_command "make KERNELRELEASE=$1 dep" "make dep" background
+            invoke_command "make -j$parallel_jobs KERNELRELEASE=$1 dep" "make dep" background
         else
-            invoke_command "make KERNELRELEASE=$1 prepare-all scripts" "make prepare-all" background
+            invoke_command "make -j$parallel_jobs KERNELRELEASE=$1 prepare-all scripts" "make prepare-all" background
         fi
     fi
     cd - >/dev/null
@@ -1268,7 +1281,7 @@ do_build()
     invoke_command "$clean" "cleaning build area" background
     echo $"DKMS make.log for $module-$module_version for kernel $kernelver ($arch)" >> "$dkms_tree/$module/$module_version/build/make.log"
     date >> "$dkms_tree/$module/$module_version/build/make.log"
-    local the_make_command="${make_command/#make/make KERNELRELEASE=$kernelver}"
+    local the_make_command="${make_command/#make/make -j$parallel_jobs KERNELRELEASE=$kernelver}"
 
     invoke_command "{ $the_make_command; } >> $dkms_tree/$module/$module_version/build/make.log 2>&1" "$the_make_command" background || \
         report_build_problem 10 $"Bad return status for module build on kernel: $kernelver ($arch)" \
@@ -3732,6 +3745,8 @@ while (($# > 0)); do
             export PS4='${BASH_SOURCE}@${LINENO}(${FUNCNAME[0]}): '
             set -x
             ;;
+        -j)
+            read_arg parallel_jobs "$1" "$2" || shift;;
         -*|--*)
             error $" Unknown option: $1"
             show_usage
@@ -3792,6 +3807,12 @@ if [[ $no_initrd && $weak_modules ]]; then
     fi
 fi
 
+# Default to -j<number of CPUs>
+parallel_jobs=${parallel_jobs:-$(get_num_cpus)}
+
+# Make sure we're not passing -j0 to make; treat -j0 as just "-j"
+[[ "$parallel_jobs" = 0 ]] && parallel_jobs=""
+
 # Run the specified action
 if [ -z "$action" ]; then
     show_usage

dkms.8

@@ -281,7 +281,6 @@ load this tarball, build and install modules on the end user's system.  If you d
 not want your RPM to contain any prebuilt binaries, be sure to specify
 .B \-\-source\-only
 in the mkrpm command.
-.TP
 .SY mkdeb
 .OP module/module\-version
 .OP -k kernel/arch
@@ -561,6 +560,15 @@ prior than DKMS 2.1.  This option currently defaults to 1.
 A supplemental configuration file to the system-wide dkms framework, typically located
 in /etc/dkms/framework.conf.  All option that are normally provided on a command line
 can be provided in this file.
+.TP
+.B \-j number
+Run no more than
+.I number
+jobs in parallel; see the -j option of
+.I make(1).
+Defaults to the number of CPUs in the system, detected by
+.I nproc(1).
+Specify 0 to impose no limit on the number of parallel jobs.
 .SH ORIGINAL MODULES
 During the first install of a module for a <kernelversion>,
 .B dkms

dkms_common.postinst

@@ -278,7 +278,7 @@ for KERNEL in $KERNELS; do
             dkms_status=`dkms status -m $NAME -v $VERSION -k $KERNEL $ARCH`
         else
             echo "Module build for kernel $KERNEL was skipped since the"
-            echo "kernel source for this kernel does not seem to be installed."
+            echo "kernel headers for this kernel does not seem to be installed."
         fi
     fi
 

sample.spec

@@ -93,7 +93,7 @@ if [ -z "$loaded_tarballs" ]; then
 	else
 		echo -e ""
 		echo -e "Module build for the currently running kernel was skipped since the"
-		echo -e "kernel source for this kernel does not seem to be installed."
+		echo -e "kernel headers for this kernel do not seem to be installed."
 	fi
 fi
 exit 0