[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/08: linux-modules: Add 'current-kernel-directory'.
From: |
Ludovic Courtès |
Subject: |
05/08: linux-modules: Add 'current-kernel-directory'. |
Date: |
Sun, 18 Mar 2018 18:24:34 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit a57df67b5932c7f458d4a31a82a477634d6af1a0
Author: Ludovic Courtès <address@hidden>
Date: Wed Mar 14 23:09:57 2018 +0100
linux-modules: Add 'current-kernel-directory'.
* gnu/build/linux-modules.scm (current-kernel-directory): New procedure.
(current-alias-file): Use it.
---
gnu/build/linux-modules.scm | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/gnu/build/linux-modules.scm b/gnu/build/linux-modules.scm
index 4fe673c..3dd60f4 100644
--- a/gnu/build/linux-modules.scm
+++ b/gnu/build/linux-modules.scm
@@ -357,12 +357,15 @@ and each module is a module name like \"snd_hda_intel\"."
(() ;empty line
(loop aliases)))))))
-(define (current-alias-file)
- "Return the absolute file name of the default 'modules.alias' file."
+(define (current-kernel-directory)
+ "Return the directory of the currently running Linux kernel."
(string-append (or (getenv "LINUX_MODULE_DIRECTORY")
"/run/booted-system/kernel/lib/modules")
- "/" (utsname:release (uname))
- "/" "modules.alias"))
+ "/" (utsname:release (uname))))
+
+(define (current-alias-file)
+ "Return the absolute file name of the default 'modules.alias' file."
+ (string-append (current-kernel-directory) "/modules.alias"))
(define* (known-module-aliases #:optional (alias-file (current-alias-file)))
"Return the list of alias/module pairs read from ALIAS-FILE. Each alias is
- branch master updated (14f2105 -> 71e08fd), Ludovic Courtès, 2018/03/18
- 01/08: import: elpa: Adjust test for HTTPS URLs., Ludovic Courtès, 2018/03/18
- 02/08: import: elpa: Return 'license:gpl3+ for ELPA only., Ludovic Courtès, 2018/03/18
- 04/08: vm: Display a backtrace upon error by default., Ludovic Courtès, 2018/03/18
- 03/08: tests: elpa: Don't actually download files., Ludovic Courtès, 2018/03/18
- 05/08: linux-modules: Add 'current-kernel-directory'.,
Ludovic Courtès <=
- 06/08: linux-modules: 'load-linux-module*' honors BLACK-LIST in recursive calls., Ludovic Courtès, 2018/03/18
- 08/08: glob: Add an extra glob pattern compilation stage., Ludovic Courtès, 2018/03/18
- 07/08: glob: Support square brackets in patterns., Ludovic Courtès, 2018/03/18