[arch-commits] Commit in dkms/trunk (4 files)

[Sébastien Luttringer]

    Date: Saturday, July 8, 2017 @ 14:37:10
  Author: seblu
Revision: 299911

upgpkg: dkms 2.4.0-2

- fix FS#54481
- fix FS#54020
- fix FS#54408

Added:
  dkms/trunk/0001-Revert-Make-newly-installed-modules-available-immedi.patch
Modified:
  dkms/trunk/PKGBUILD
  dkms/trunk/hook.install
  dkms/trunk/hook.remove

-----------------------------------------------------------------+
 0001-Revert-Make-newly-installed-modules-available-immedi.patch |   31 ++++++++++
 PKGBUILD                                                        |   14 ++--
 hook.install                                                    |    2 
 hook.remove                                                     |    2 
 4 files changed, 41 insertions(+), 8 deletions(-)

Added: 0001-Revert-Make-newly-installed-modules-available-immedi.patch
===================================================================
--- 0001-Revert-Make-newly-installed-modules-available-immedi.patch	                        (rev 0)
+++ 0001-Revert-Make-newly-installed-modules-available-immedi.patch	2017-07-08 14:37:10 UTC (rev 299911)
@@ -0,0 +1,31 @@
+From ca38ccd38c69a096dafa51c426ee3548980d5e2a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9bastien=20Luttringer?= <seblu at seblu.net>
+Date: Sat, 8 Jul 2017 15:50:55 +0200
+Subject: [PATCH] Revert "Make newly installed modules available immediately"
+To: dkms-devel at dell.com
+
+This reverts commit f5bfb12fef1fc06e56355cdba500eaa98d4e6aa8.
+---
+ dkms | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/dkms b/dkms
+index a6cedc8..3ff71d5 100644
+--- a/dkms
++++ b/dkms
+@@ -1522,12 +1522,6 @@ install_module()
+             exit 6
+     }
+ 
+-    # Make the newly installed modules available immediately
+-    find /sys/devices -name modalias -print0 | xargs -0 cat | xargs modprobe -a -b -q
+-    if [ -f /lib/systemd/system/systemd-modules-load.service ]; then
+-        systemctl restart systemd-modules-load.service
+-    fi
+-
+     # Do remake_initrd things (save old initrd)
+     [[ $remake_initrd ]] && ! make_initrd "$kernelver" "$arch" && {
+         do_uninstall "$kernelver" "$arch"
+-- 
+Sébastien "Seblu" Luttringer
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-07-08 12:18:19 UTC (rev 299910)
+++ PKGBUILD	2017-07-08 14:37:10 UTC (rev 299911)
@@ -4,7 +4,7 @@
 
 pkgname=dkms
 pkgver=2.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Dynamic Kernel Modules System'
 arch=('any')
 url='https://github.com/dell/dkms'
@@ -14,17 +14,19 @@
 optdepends=('linux-headers: build modules against the Arch kernel'
             'linux-lts-headers: build modules against the LTS kernel'
             'linux-zen-headers: build modules against the ZEN kernel'
-            'linux-grsec-headers: build modules against the GRSEC kernel')
+            'linux-hardened-headers: build modules against the HARDENED kernel')
 backup=('etc/dkms/framework.conf')
 install=$pkgname.install
 source=("git+https://github.com/dell/dkms.git#tag=v$pkgver"
         'hook.install'
         'hook.remove'
-        'hook.sh')
+        'hook.sh'
+        '0001-Revert-Make-newly-installed-modules-available-immedi.patch')
 md5sums=('SKIP'
-         '2dfc9905738199bf1fdbaa08d306e265'
-         '4d959fdd4f168b5a6921712404066566'
-         'f1ea074ef22d1afe855a1eb63233566b')
+         '90f1486e0af9aab85e8c60d456802c63'
+         '2e8ffd0c2ddec02872d0234befd129fd'
+         'f1ea074ef22d1afe855a1eb63233566b'
+         'd3b91ef709f567a375f4bbdbd3291d2b')
 
 prepare() {
   cd dkms

Modified: hook.install
===================================================================
--- hook.install	2017-07-08 12:18:19 UTC (rev 299910)
+++ hook.install	2017-07-08 14:37:10 UTC (rev 299911)
@@ -4,7 +4,7 @@
 Type = File
 Target = usr/src/*/dkms.conf
 Target = usr/lib/modules/*/build/include/
-Target = usr/lib/modules/*/kernel/
+Target = usr/lib/modules/*/modules.alias
 
 [Action]
 Description = Install DKMS modules

Modified: hook.remove
===================================================================
--- hook.remove	2017-07-08 12:18:19 UTC (rev 299910)
+++ hook.remove	2017-07-08 14:37:10 UTC (rev 299911)
@@ -4,7 +4,7 @@
 Type = File
 Target = usr/src/*/dkms.conf
 Target = usr/lib/modules/*/build/include/
-Target = usr/lib/modules/*/kernel/
+Target = usr/lib/modules/*/modules.alias
 
 [Action]
 Description = Remove DKMS modules