[dkms] Prevent parallel depmod failure with autoinstall (#1113946)

[Simone Caronni]

commit 13538559728e0a1cc78d5f1d882731948316808f
Author: Simone Caronni <negativo17 at gmail.com>
Date:   Fri Jun 27 16:23:44 2014 +0200

    Prevent parallel depmod failure with autoinstall (#1113946)

 dkms-no-parallel-build.patch |   31 +++++++++++++++++++++++++++++++
 dkms.spec                    |    7 ++++++-
 2 files changed, 37 insertions(+), 1 deletions(-)
---
diff --git a/dkms-no-parallel-build.patch b/dkms-no-parallel-build.patch
new file mode 100644
index 0000000..f5015e9
--- /dev/null
+++ b/dkms-no-parallel-build.patch
@@ -0,0 +1,31 @@
+From 02c9c3cb070383fe5842ab779f0c8da7c60c8229 Mon Sep 17 00:00:00 2001
+From: Julien Floret <julien.floret at 6wind.com>
+Date: Fri, 27 Jun 2014 10:36:08 +0200
+Subject: [PATCH] Prevent parallel depmod failure with autoinstall
+
+Do not run install_module in parallel in dkms_autoinstall.
+
+This commit prevents race conditions between several depmod instances
+which may result in installation failures.
+
+Signed-off-by: Julien Floret <julien.floret at 6wind.com>
+---
+ dkms |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dkms b/dkms
+index 00dd597..01495c2 100644
+--- a/dkms
++++ b/dkms
+@@ -3241,7 +3241,7 @@ autoinstall() {
+ 		for mv in "${to_install[@]}"; do
+ 			IFS=/ read m v <<< "$mv"
+ 			if [[ -z "${build_depends[$m]}" ]]; then
+-				(module="$m"; module_version="$v"; install_module) &
++				(module="$m"; module_version="$v"; install_module)
+ 				installed_modules[${#installed_modules[@]}]="$m"
+ 				install_count=$(($install_count +1))
+ 			else
+-- 
+1.7.10.4
+
diff --git a/dkms.spec b/dkms.spec
index b818266..6b066dc 100644
--- a/dkms.spec
+++ b/dkms.spec
@@ -5,7 +5,7 @@
 Summary:        Dynamic Kernel Module Support Framework
 Name:           dkms
 Version:        2.2.0.3
-Release:        23%{dist}
+Release:        24%{dist}
 License:        GPLv2+
 Group:          System Environment/Base
 BuildArch:      noarch
@@ -31,6 +31,7 @@ Patch8:         %{name}-add-dependency-logic-for-automatic-builds.patch
 Patch9:         %{name}-fix-zfs-autoinstall-failures-for-kernel-upgrades.patch
 Patch10:        %{name}-reset-build-dependencies.patch
 Patch11:        %{name}-bash-syntax-fix.patch
+Patch12:        %{name}-no-parallel-build.patch
 
 Requires:       coreutils
 Requires:       cpio
@@ -79,6 +80,7 @@ method for installing module RPMS as originally developed by Dell.
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 %endif
 
 %build
@@ -159,6 +161,9 @@ fi
 %{_sysconfdir}/bash_completion.d/%{name}
 
 %changelog
+* Fri Jun 27 2014 Julien Floret <julien.floret at 6wind.com> - 2.2.0.3-24
+- Prevent parallel depmod failure with autoinstall (#1113946).
+
 * Tue Jun 17 2014 Simone Caronni <negativo17 at gmail.com> - 2.2.0.3-23
 - Update shell syntax (#1104253).