branch master updated: system: Automatically adjust linux-module packages to use the operating-system's kernel.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

dannym pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new f91ad0b  system: Automatically adjust linux-module packages to use the 
operating-system's kernel.
f91ad0b is described below

commit f91ad0b13d8d3d5b1ae92e209b1be6e8473385ba
Author: Danny Milosavljevic <address@hidden>
AuthorDate: Wed Apr 22 22:58:11 2020 +0200

    system: Automatically adjust linux-module packages to use the
    operating-system's kernel.
    
    * gnu/system.scm (package-for-kernel): New procedure.
    (operating-system-directory-base-entries): Use it.
    * gnu/tests/linux-module.scm: Test it.
---
 gnu/system.scm              | 18 +++++++++++++++++-
 gnu/tests/linux-modules.scm | 11 ++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/gnu/system.scm b/gnu/system.scm
index 3ee2c84..29e6228 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -33,6 +33,7 @@
   #:use-module (guix derivations)
   #:use-module (guix profiles)
   #:use-module (guix ui)
+  #:use-module (guix utils)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages guile)
@@ -477,6 +478,16 @@ OS."
   (file-append (operating-system-kernel os)
                "/" (system-linux-image-file-name)))
 
+(define (package-for-kernel target-kernel module-package)
+  "Return a package like MODULE-PACKAGE, adapted for TARGET-KERNEL, if
+possible (that is if there's a LINUX keyword argument in the build system)."
+  (package
+    (inherit module-package)
+    (arguments
+     (substitute-keyword-arguments (package-arguments module-package)
+       ((#:linux kernel #f)
+        target-kernel)))))
+
 (define* (operating-system-directory-base-entries os)
   "Return the basic entries of the 'system' directory of OS for use as the
 value of the SYSTEM-SERVICE-TYPE service."
@@ -487,7 +498,12 @@ value of the SYSTEM-SERVICE-TYPE service."
                          (kernel
                           (profile-derivation
                            (packages->manifest
-                            (cons kernel modules))
+                            (cons kernel
+                             (map (lambda (module)
+                                    (if (package? module)
+                                        (package-for-kernel kernel module)
+                                        module))
+                                  modules)))
                            #:hooks (list linux-module-database)))
                          (initrd -> (operating-system-initrd-file os))
                          (params -> (operating-system-boot-parameters-file 
os)))
diff --git a/gnu/tests/linux-modules.scm b/gnu/tests/linux-modules.scm
index 788bdc8..953b132 100644
--- a/gnu/tests/linux-modules.scm
+++ b/gnu/tests/linux-modules.scm
@@ -28,8 +28,10 @@
   #:use-module (guix derivations)
   #:use-module (guix gexp)
   #:use-module (guix modules)
+  #:use-module (guix packages)
   #:use-module (guix monads)
   #:use-module (guix store)
+  #:use-module (guix utils)
   #:export (%test-loadable-kernel-modules-0
             %test-loadable-kernel-modules-1
             %test-loadable-kernel-modules-2))
@@ -118,5 +120,12 @@ with one extra module.")
    (description "Tests loadable kernel modules facility of <operating-system>
 with two extra modules.")
    (value (run-loadable-kernel-modules-test
-           (list acpi-call-linux-module ddcci-driver-linux)
+           (list acpi-call-linux-module
+                 (package
+                   (inherit ddcci-driver-linux)
+                   (arguments
+                    `(#:linux #f
+                      ,@(strip-keyword-arguments '(#:linux)
+                                                 (package-arguments
+                                                  ddcci-driver-linux))))))
            '("acpi_call" "ddcci")))))