[arch-commits] Commit in dkms/trunk (04-no-action-usage.patch PKGBUILD dkms.systemd)

[Sébastien Luttringer]

    Date: Friday, October 23, 2015 @ 18:07:59
  Author: seblu
Revision: 144796

upgpkg: dkms 2.2.0.3-16

- fix FS#46719
- error with when action

Added:
  dkms/trunk/04-no-action-usage.patch
Modified:
  dkms/trunk/PKGBUILD
  dkms/trunk/dkms.systemd

--------------------------+
 04-no-action-usage.patch |   16 ++++++++++++++++
 PKGBUILD                 |   10 ++++++----
 dkms.systemd             |    2 +-
 3 files changed, 23 insertions(+), 5 deletions(-)

Added: 04-no-action-usage.patch
===================================================================
--- 04-no-action-usage.patch	                        (rev 0)
+++ 04-no-action-usage.patch	2015-10-23 16:07:59 UTC (rev 144796)
@@ -0,0 +1,16 @@
+# Copyright: Sébastien Luttringer <seblu at seblu.net>
+--- a/dkms	2015-10-23 13:57:36.624685834 +0200
++++ b/dkms	2015-10-23 17:54:39.495367417 +0200
+@@ -3465,6 +3465,12 @@
+ 
+ # Sanity checking
+ 
++# No action, we exit
++if [[ -z $action ]]; then
++    show_usage
++    die 4 $"No action was specified."
++fi
++
+ # Error out if binaries-only is set and source-only is set
+ if [[ $binaries_only && $source_only ]]; then
+     die 8 $" You have specified both --binaries-only and --source-only." \

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-10-23 16:04:38 UTC (rev 144795)
+++ PKGBUILD	2015-10-23 16:07:59 UTC (rev 144796)
@@ -4,7 +4,7 @@
 
 pkgname=dkms
 pkgver=2.2.0.3
-pkgrel=15
+pkgrel=16
 pkgdesc='Dynamic Kernel Modules System'
 arch=('any')
 url='http://linux.dell.com/dkms/'
@@ -20,14 +20,16 @@
         "$pkgname.systemd"
         '01-broken-uninstall.patch'
         '02-no-kernel-hook.patch'
-        '03-fix-post-build.patch')
+        '03-fix-post-build.patch'
+        '04-no-action-usage.patch')
 md5sums=('11a8aaade2ebec2803653837c7593030'
          '33be2fbf1bcc1b3fb2f38d9e7eaa809d'
          '02e9744e3fdc3d2f68e46966fb32e260'
-         '267632312aa52a190ec0db0758920dd3'
+         '0158265dace30b6cdd06244e844b3e5f'
          '2dfd8656dc79afd229c1481a90fb645b'
          '82d520c39c99c34977e48b313a189c6c'
-         'fd7cb2119954b3b9d760a8eebd3c583d')
+         'fd7cb2119954b3b9d760a8eebd3c583d'
+         'b54ad33d0e8213fd1c37be723cc0ef7c')
 
 prepare() {
   # patch

Modified: dkms.systemd
===================================================================
--- dkms.systemd	2015-10-23 16:04:38 UTC (rev 144795)
+++ dkms.systemd	2015-10-23 16:07:59 UTC (rev 144796)
@@ -23,7 +23,7 @@
   local ret=0
   list_dkms_modules
   for m in "${DKMS_MODULES[@]}"; do
-    modprobe "$m"
+    modprobe -b "$m"
     ret+=$?
   done
   return $ret