me
/
guix
Archived
1
0
Fork 0

linux-initrd: Avoid looking up builtin modules.

* gnu/system/linux-initrd.scm (flat-linux-module-directory)
[build-exp]<builtin-modules,modules-to-lookup>: New variables.
<modules>: Use ‘modules-to-lookup’ to avoid looking up builtin modules.

Change-Id: I60fdae0211bb6632508b1c63582e013e78186cd1
master
Hilton Chain 2024-02-26 13:47:13 +08:00
parent 7fd0975edc
commit 8f8ec56052
No known key found for this signature in database
GPG Key ID: ACC66D09CA528292
1 changed files with 13 additions and 1 deletions

View File

@ -132,15 +132,27 @@ MODULES and taken from LINUX."
#~(begin #~(begin
(use-modules (gnu build linux-modules) (use-modules (gnu build linux-modules)
(guix build utils) (guix build utils)
(rnrs io ports)
(srfi srfi-1) (srfi srfi-1)
(srfi srfi-26)) (srfi srfi-26))
(define module-dir (define module-dir
(string-append #$linux "/lib/modules")) (string-append #$linux "/lib/modules"))
(define builtin-modules
(call-with-input-file
(first (find-files module-dir "modules.builtin$"))
(lambda (port)
(map file-name->module-name
(string-tokenize
(get-string-all port))))))
(define modules-to-lookup
(lset-difference string=? '#$modules builtin-modules))
(define modules (define modules
(let* ((lookup (cut find-module-file module-dir <>)) (let* ((lookup (cut find-module-file module-dir <>))
(modules (map lookup '#$modules))) (modules (map lookup modules-to-lookup)))
(append modules (append modules
(recursive-module-dependencies (recursive-module-dependencies
modules modules